gentoo resync : 14.05.2020

361 files changed, 1654 insertions, 3877 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 6f9c00a51434..8ddfef62635f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/abstract/Manifest b/dev-ruby/abstract/Manifest
index 49f0f09c00e8..c6912ab38f7b 100644
--- a/dev-ruby/abstract/Manifest
+++ b/dev-ruby/abstract/Manifest
@@ -1,3 +1,3 @@
 DIST abstract-1.0.0.gem 12288 BLAKE2B c61fe73f5a5b765296e4a61acfa14b39468878a442a1ce8689e846089da9a3d6c8f5425a791040865d5aadd435ac78de6f48f809f081ca0883c71f733e4cbe5c SHA512 7c6fffc012baf704a27470fecf44dc97e6ca9f5bf9db47c20f23e59376af1262c4618ad70a70faa446339a79f94bbce04c2f5a6c506bd010c60a0fa5f60f346c
-EBUILD abstract-1.0.0-r3.ebuild 652 BLAKE2B 76eb18e30e5c5ec0be7a3335414c9506c160d12fc73734cf2b0b6b8dabff5ecc626587c3f6669707c43a5e225d0c4f574c1260f216466f8684429e046684600f SHA512 29ecc27aaca24b03adb02c13f172cb7b9ab7945395f6ccd4f49e222d8acf8571310aeeb9ef191fc577dc50d9ed7c613e6d8fb0cd1f109585b03f62c3826ce9c0
+EBUILD abstract-1.0.0-r3.ebuild 659 BLAKE2B 0bea2692171b9ad0dbc7da692e624b207bd6ad0bfb6082f9f0a09d7f619f010b322e5a68d6ca916c26125aa03c2a59323f14c38cc6820bb602debbf4f68d727d SHA512 25c16a6ad19ba8b69c829679d5b1537e236781584b1f0f1c19b9e8cd6a088a7bdd010cddd6685029dd4ed5caaaf525d3063509af23d39171be876086a75b256b
 MISC metadata.xml 326 BLAKE2B 9d949e43d77128e14b13f83c61b85efa1d766d2b09b33aa10957282273b233bb5f6785b570e08249e3acc3920e3c5327fc834e8973d252519ec0963efdc379f4 SHA512 af7919ed026803725ee33c836a16034b32eade1a09f18ad5f5a506454fcdbbd2cab3cfc0e21c494ad1380795439719f83acbae1c3cc45a3cec6b1e02cebba390
diff --git a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
index a69dc47845a7..b78a1555c0f7 100644
--- a/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
+++ b/dev-ruby/abstract/abstract-1.0.0-r3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://rubygems.org/gems/abstract"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 each_ruby_test() {
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 61cd9b99db8f..b2d35a58a222 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,5 +1,7 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+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-6.0.2.2.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-6.0.3.ebuild b/dev-ruby/actioncable/actioncable-6.0.3.ebuild
new file mode 100644
index 000000000000..e52e0ab9a501
--- /dev/null
+++ b/dev-ruby/actioncable/actioncable-6.0.3.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 9368e8e0c7d5..4e8d4daf0f17 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,3 +1,5 @@
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+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.ebuild 1660 BLAKE2B 481fcbe9c4d1819b18c5e27907839cc9e0f9d14010cd8bb11613e6f3acc4953703995e4786f58370349386810993d726d1b5f53c6ffcd8c703220759e3dc4b7f SHA512 3b6f884f4f7caf6fb8246bad4503bffe732ac4d1695cad7ceae978347a68b73df19a07bac0d745ea6ed015ac65c703c7f94dfcddcff99dac73991ba31fc11c43
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-4.2.11.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.3.ebuild
index aeb691646830..bbdab69175ce 100644
--- a/dev-ruby/actionmailer/actionmailer-4.2.11.1.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-6.0.3.ebuild
@@ -1,48 +1,52 @@
-# 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"
+EAPI=7
+USE_RUBY="ruby25 ruby26"
 
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
+RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
 
-inherit ruby-fakegem versionator
+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="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~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-1.0.5:1"
+	~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:0.14
+	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\|minitest\|mime-types\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/rake/ s/12.3/12.4/ ; /dalli/ s/2.7.7/2.7.10/' \
+	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
+}
 
-	# 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
+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 32e4eb2f174d..963e41ba4cf2 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,7 +1,7 @@
-DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-EBUILD actionmailer-4.2.11.1.ebuild 1668 BLAKE2B be5e490a600cd21d3e4938e65f6932a0b9728b0fd1ee95dc6a7a78124d880e2400b34761d0ac6b66e1058e61545a35f0a4f9b1ee0d66afb27ef643cd4c2b61fb SHA512 c602745eaab8bd280a4a1afc418ca2ff095dfbc14b2309831e99c2486171cd0e6bad446bfd44b43bc57ec2331f1e6b2beea9ab14581fabdf3412f0d5b44098da
+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-6.0.2.2.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-6.0.3.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.3.ebuild
new file mode 100644
index 000000000000..9de7bbb7b27e
--- /dev/null
+++ b/dev-ruby/actionmailer/actionmailer-6.0.3.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-xml_parser/Manifest b/dev-ruby/actionpack-xml_parser/Manifest
index 970b0aa5b862..b6de4ab5b5b4 100644
--- a/dev-ruby/actionpack-xml_parser/Manifest
+++ b/dev-ruby/actionpack-xml_parser/Manifest
@@ -1,5 +1,3 @@
-DIST actionpack-xml_parser-1.0.2.tar.gz 6623 BLAKE2B 4dc039b2db8397d41f7da5cc643e8e990b4a3a5a1e86e67657a6a59681688144562a66484d1bec49b7166b1df5d2e30ddd882dcb2448cd14e6b44580e2fc354c SHA512 6fb9323b2632059d6c253083dfe6a09c413d4a5f7d622457402db95529ccad6d28b0471b01f4555c4e448b65183e6d07ef639de994c47c4858d2bfe5318aaa0b
 DIST actionpack-xml_parser-2.0.1.tar.gz 6494 BLAKE2B 271e1352085e7c75754253222c9f861f7ece9875102a0bb4c47e20311367fcc040c5680ad0406112f8e312c4a8ae1a3f9b6d33f3736db3614ca1c3584942f800 SHA512 a240e59178722025a0c967cfc2f63ca1ed8a2aff55ad913652f06018b712a7009eecd915f494dc4087de12ad5dbe5a0f3c7290fc530a2e475b39318520809112
-EBUILD actionpack-xml_parser-1.0.2.ebuild 838 BLAKE2B d29970900fd94346b8d780ef35b50102c4d3c930cb0607de030e0f757b272c999a133ff0217517e66eaba1f7e3bdc6a7173d792fbb77ce6b35adc173ef1cdf2f SHA512 636f0991a94b457cc9f511f1a435894952772cb9470fa755065358c20268d4da25b7ad609289387e54cfe78a932df47d9f31edf7d933a985990a6542ff31b499
 EBUILD actionpack-xml_parser-2.0.1.ebuild 965 BLAKE2B 2671125c4de6d806e39e4269c9f1b745da007d263b929091502e13956bc9f58fe4700cf014ebbf56093f96c9f1a87e952a810c98c436a6da7b04d8de269bacaa SHA512 281ab37e0a48485ad1d75d7be5e06d18bacde945f0c13f52b8034d9eefc8fa93f65fa7b7fdaa385d99f38a398efaf153c585f5ea0651f31707cfd66b71229522
 MISC metadata.xml 343 BLAKE2B fae09bfee8e2838dae045fb6920229bf6d0d87affced294d61535b221af86767fc95fec8a7f5f87832d1948e50165369751b6450b84b31d0611e72cb0eafba19 SHA512 2e931999edbe73e74146107d2a75df2050649d682fcbba40cb877b742af15de0d0709a3acbee03722eff1bd1ddc3619a3c2a61e976a526f34f1bbc3bb0b87593
diff --git a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-1.0.2.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-1.0.2.ebuild
deleted file mode 100644
index 5d0dbebe3ebc..000000000000
--- a/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-1.0.2.ebuild
+++ /dev/null
@@ -1,31 +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_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="XML parameters parser for Action Pack (removed from core in Rails 4.0)"
-HOMEPAGE="https://github.com/rails/actionpack-xml_parser"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/actionpack-4.0.0:* <dev-ruby/actionpack-5:*"
-ruby_add_bdepend "test? ( >=dev-ruby/activesupport-4.0.0 )"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
-	sed -i -e '1igem "actionpack", "~>4.0"' test/helper.rb || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true ${RUBY} -Ilib:test test/xml_params_parsing_test.rb || die
-}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 37789bdfc3a6..6048249e6f4f 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,7 +1,7 @@
-DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-EBUILD actionpack-4.2.11.1.ebuild 1858 BLAKE2B 92cfe0735197abfb283c49b28887d421166ea56dbded2d6ce84089cd85d10c2d58ff5c53e4576094c6bfe6eda08d495cbb64e8ed5c589a675de1b9406a3d8451 SHA512 35c6071ac1d25db006886699e59bdaeaa64ec31cc70ff5cdaf41fd046d8fe87ff63ef1bb84acfba974420f3844a58fc243568ab8a2fdc201fa2add9d4dbb3981
-EBUILD actionpack-5.2.4.2.ebuild 1738 BLAKE2B f7c0e1a2ae928478a0d6a378b05e9db3357ad97985c60a9783a01c467cd1aab07ec2b875a0165be1711764d50e163d70034a3e5bb49dbc262f4647f5da359e6d SHA512 eeeea7054d6516146302112fb29c50dcb73577d25ebb7beedc4b902558df24b378765dbf9603bafb9a549608263f48068b11d77581ade591097c7422f333ed20
-EBUILD actionpack-6.0.2.2.ebuild 1529 BLAKE2B 2cf61810636a3bc5e6a13af4f8d1b745aec8ada9f040e62715cc67a3752e4aec095104c8ee16461edd6cf070713b82bb5a9262b883063d12db0e779b036bef30 SHA512 e66f5210de98042015c85e565008338edc5b102e54f0b2c1d47d30e977ed35ba4f783f92db493a37d71917139f4a95c92bdaac88a00afb47f0156e4860d37429
+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-6.0.2.2.ebuild 1797 BLAKE2B 50ab2ddfe0dc8967b3c931ae1f5874ab838e6afc91f67c35f523c70e108b011861531ee1768c19c3d7aa8a08b5fb81f654acb302fef5d749366c7ea09de5a0a0 SHA512 be57b1597b60f2d9a77ae212ac2f802909822435451c8b7d5643068bb5881ffd683fe965ad4b40d8f29459313e3853651484aa8b24eb49651d4b047cb5d1f50f
+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.2.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild
index 7a0a34f9e5bd..92a68b49adb7 100644
--- a/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.2.4.2.ebuild
@@ -57,4 +57,7 @@ all_ruby_prepare() {
 		-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
 }
diff --git a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild b/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
index f22c41d0d073..4d8bf0f9ee17 100644
--- a/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.2.2.ebuild
@@ -41,6 +41,7 @@ ruby_add_bdepend "
 		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
 	)"
@@ -52,4 +53,7 @@ all_ruby_prepare() {
 		-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/actionpack/actionpack-4.2.11.1.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.ebuild
index c1cad700e9a9..3ae431f685a6 100644
--- a/dev-ruby/actionpack/actionpack-4.2.11.1.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.3.ebuild
@@ -1,25 +1,27 @@
-# 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"
+USE_RUBY="ruby25 ruby26 ruby27"
 
-RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
 
-inherit ruby-fakegem versionator
+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="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -27,32 +29,31 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionview-${PV}
-	>=dev-ruby/rack-1.6.0:1.6
-	>=dev-ruby/rack-test-0.6.2:0.6
-	>=dev-ruby/rails-html-sanitizer-1.0.2:1
-	>=dev-ruby/rails-dom-testing-1.0.5:1
+	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\|minitest\|mime-types\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/rake/ s/12.3/12.4/ ; /dalli/ s/2.7.7/2.7.10/' \
+	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
 
-	# Skip a failing test related to security updates in 4.2.5.1. Let's
-	# assume that this is not a bug but a test lagging a security
-	# measure.
-	sed -i -e '/test_dynamic_render_with_file/,/^  end/ s:^:#:' \
-		test/controller/render_test.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
 }
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 95da61fb37eb..9f8338952f95 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,3 +1,5 @@
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+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.ebuild 1632 BLAKE2B 44123592c0926e9d0b5d55bf9219c7770eeb4f4261a62b5ae138b21f351694204ee46e53c4875342475d45edba1d2a5561308b94df3175cf31b3f1433ee593ec SHA512 3488b55a41431d365ccfc6aeb2715effc81ddf0981cdb5d8989f22e2dd8ccbe6c21bb8fb15624e56a8d452bbc82b37f143184e2cd1cfd2d7090b59c838ad6cf4
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.ebuild
new file mode 100644
index 000000000000..81ba03261fc8
--- /dev/null
+++ b/dev-ruby/actiontext/actiontext-6.0.3.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 9343d4ca8a49..409cc9244d3a 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,7 +1,7 @@
-DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-EBUILD actionview-4.2.11.1.ebuild 1585 BLAKE2B c001b8c56264e3d1969bf8c07c54ae6580cde982b38147c4c15eb1320e4ccd4228f1b554dc80c1f04150d6e14dedd25687e9d3707881532eba44286e9cbfec61 SHA512 c7de03ec6a2865e763be290f1f76cbcee866a20d49f3aaf44ff4f040ac0e5a878ce94083eca8d5817b30908997c25e82b4ccd84569ac770affc30e8f7169c5d8
-EBUILD actionview-5.2.4.2.ebuild 1883 BLAKE2B 6fb8130be8e082310b011cc90241106a51c326bee49471d27c0ef967dee1ba1b8b903a1ebf408557efbee860bc53535d1242d5c36feb4e7cb175954cf38c6f69 SHA512 528c32e4cc542841c5961e00d60025884d634a89f90ca4d64922a9aeaba71e073b4d201126e59d6529c94a316ccdd3e3cf4dd2170c45a992cf6cb26df88fd2ef
+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-6.0.2.2.ebuild 1716 BLAKE2B def5b4aff4c34cc23077f578502c1be5302ae61e47da05a80f31424466d98aab251899bebb9113d5874b4b165f7c262543d51e76036e9b8628e8838bddcb8479 SHA512 cc55750d80c42f34946a9991c2e8871d6dbb6da46db03a49fa63d4a9d49cca8304af3d28749908480c46918901b299c4573fa0e7b4b735594fdeec03b8ca05c3
+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.2.ebuild b/dev-ruby/actionview/actionview-5.2.4.2.ebuild
index 76df6e724c6e..87622071e472 100644
--- a/dev-ruby/actionview/actionview-5.2.4.2.ebuild
+++ b/dev-ruby/actionview/actionview-5.2.4.2.ebuild
@@ -49,12 +49,13 @@ all_ruby_prepare() {
 		-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
-
-	sed -e '1igem "actionpack", "~> 5.2.0"' \
-		-e '1igem "activemodel", "~> 5.2.0"' \
-		-e '1igem "railties", "~> 5.2.0"' \
+	# 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-4.2.11.1.ebuild b/dev-ruby/actionview/actionview-6.0.3.ebuild
index 56b477c633e8..0b4fd032262f 100644
--- a/dev-ruby/actionview/actionview-4.2.11.1.ebuild
+++ b/dev-ruby/actionview/actionview-6.0.3.ebuild
@@ -1,25 +1,27 @@
-# 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"
+USE_RUBY="ruby25 ruby26 ruby27"
 
-RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
-inherit ruby-fakegem versionator
+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="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -27,24 +29,35 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/rails-html-sanitizer-1.0.3:1
-	>=dev-ruby/rails-dom-testing-1.0.5:1
+	>=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:0.14
+		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 '/rake/ s/12.3/12.4/ ; /dalli/ s/2.7.7/2.7.10/' \
 		-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 566619ee4478..b4a63503332a 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,7 +1,7 @@
-DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-EBUILD activejob-4.2.11.1.ebuild 1070 BLAKE2B bdd6e12043c4ee89a5efe8477e44d0d40d15a6f8f14952d9059fc2380f8c4a4e94365057673e16b2f08ee15df2a5b401215b1bd3f1ec6ca6a4584698d6933cda SHA512 6e9cc9d8e3097bbd6e0fbf3fd57a5b40d7abcf43482e1df2a9c104acab407b4818508580953f713aea500dca6a2a192b64935a2c4d506a1f229a756468af2196
+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
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-4.2.11.1.ebuild b/dev-ruby/activejob/activejob-6.0.3.ebuild
index 6ffd1014fe70..b6081286eb11 100644
--- a/dev-ruby/activejob/activejob-4.2.11.1.ebuild
+++ b/dev-ruby/activejob/activejob-6.0.3.ebuild
@@ -1,37 +1,39 @@
-# 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"
+USE_RUBY="ruby25 ruby26"
 
-RUBY_FAKEGEM_TASK_DOC=""
+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 versionator
+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="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+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/globalid-0.3.0
+	>=dev-ruby/globalid-0.3.6
 "
 
 ruby_add_bdepend "
 	test? (
-		>=dev-ruby/mocha-0.14.0:0.14
+		dev-ruby/mocha
 	)"
 
 all_ruby_prepare() {
@@ -39,5 +41,7 @@ all_ruby_prepare() {
 	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
 
 	# Remove all currently unpackaged queues.
-	sed -i -e 's/delayed_job qu que queue_classic resque sidekiq sneakers sucker_punch backburner//' Rakefile || die
+	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/activeldap/Manifest b/dev-ruby/activeldap/Manifest
index 2bc67f1b5008..52120c31676d 100644
--- a/dev-ruby/activeldap/Manifest
+++ b/dev-ruby/activeldap/Manifest
@@ -1,8 +1,6 @@
-DIST activeldap-4.0.6.gem 225280 BLAKE2B 0f03ef95f3d0600d2661eab048c8dda3fbabe519add67f7785895e346d835d1e0396270f829f16a982f12863c80378be2f4f7ff7cf84016007b005b1914cec15 SHA512 03053e3798b557c73c3a0918b72d1d3c2cada4da3475913ef17a6f9f2f1ac1e102052459ef1a6d8c25ce41382b64c1a3097ccba1c768497a33a3a971b9778d3b
 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
-EBUILD activeldap-4.0.6.ebuild 856 BLAKE2B 44419f128f93e1ee06e4b4012c0c041e67dbaf2c38af7d65f4c5b8f978ec7f8caa15c5bf36e2f01cd23e621004d51cb3169737450741ff91f16cb737ea8f59d9 SHA512 da750eb877564477f4c5d1d7a4b3ab4359339b74d6d5113b5964a43de35a0dbc5be8057945befc8ae590799add88e8b1019df3d073c5055033656bfd1fc6e5d1
 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
diff --git a/dev-ruby/activeldap/activeldap-4.0.6.ebuild b/dev-ruby/activeldap/activeldap-4.0.6.ebuild
deleted file mode 100644
index 7d974c43a6c6..000000000000
--- a/dev-ruby/activeldap/activeldap-4.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.textile 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="4"
-KEYWORDS="~amd64"
-IUSE=""
-
-# Most tests require a live LDAP server to run.
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>dev-ruby/activemodel-4.0.0:*
-	dev-ruby/locale
-	dev-ruby/ruby-gettext
-	dev-ruby/gettext_i18n_rails
-	|| ( >=dev-ruby/ruby-ldap-0.8.2 dev-ruby/ruby-net-ldap )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc doc/text/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 8a8e5c35ecf0..74e812922437 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,7 +1,7 @@
-DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-EBUILD activemodel-4.2.11.1.ebuild 1636 BLAKE2B 670d133746729c900586c4238698548c8aedcc90f670c3d80d20d1841d4123d71f010189ef21673e3575b5d2c1b181eac6c7439571a29aa0d7e881b583ecf3e9 SHA512 2dc483fc464c85303f605d7acfe07775f1fb6242a2e5e7f8f9e659f781a80431f70c8c79dceb15af5c1b6f39fc003a52ebc4cedcc9e1aa4bf6af0ef7526550a9
+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-6.0.2.2.ebuild 938 BLAKE2B 5bbef0bc7a8517807f644bfad981cd0aef5bbf2ee844acc6092b78c8a62c838ba77c7b773da3d4055919afcb3c7ac710d8bb3ee5c57ec007a5108b05c4492948 SHA512 28a9332864cb881573e93c5df934f3dad9b95e33c5348d687fb2c98548594b2fcd8ddcd9373b7a91ec32eb55c3552c01b8aa6b0c3038f295423e73957f1bfd69
+EBUILD activemodel-6.0.2.2.ebuild 951 BLAKE2B 47b57f9a3f1a935b29c0b07414e8a6fc19056bf85d4447f28c06d4a5897a3f057a1a65791566c49f724a49b9602f809a39cc9a25c80bd7f71429421df608d860 SHA512 60e56f0cb90614f7644bc95124a416c6b7b220f856e4d3ff7b30e9aec89fc85a4592b7f8992be272ae0a685bb6d03d1fc508562d918a73e3d2feadd2e60af5ca
+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-4.2.11.1.ebuild b/dev-ruby/activemodel/activemodel-4.2.11.1.ebuild
deleted file mode 100644
index 8afaa127c304..000000000000
--- a/dev-ruby/activemodel/activemodel-4.2.11.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-inherit ruby-fakegem versionator
-
-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="$(get_version_component_range 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*:*
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-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\|uglifier\|minitest\|mime-types\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/rake/ s/12.3/12.4/ ; /dalli/ s/2.7.7/2.7.10/' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid test crashing newer versions of minitest
-	rm -f test/cases/railtie_test.rb || die
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.2.2.ebuild b/dev-ruby/activemodel/activemodel-6.0.2.2.ebuild
index 890cc4762431..84c440523f59 100644
--- a/dev-ruby/activemodel/activemodel-6.0.2.2.ebuild
+++ b/dev-ruby/activemodel/activemodel-6.0.2.2.ebuild
@@ -19,7 +19,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 ~hppa ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.ebuild b/dev-ruby/activemodel/activemodel-6.0.3.ebuild
new file mode 100644
index 000000000000..1494c493a78d
--- /dev/null
+++ b/dev-ruby/activemodel/activemodel-6.0.3.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 fe7728b02aed..9b4033efd0f7 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,7 +1,7 @@
-DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-EBUILD activerecord-4.2.11.1.ebuild 2449 BLAKE2B a26059816f637e8138298795592fcaf8d839509fa62248ac010f065e7211bd63bad58183364dcf7aa9e2f7f1614c4a85fcde33f96f57ab314515c175e437256e SHA512 726fba126d24ab9f3a90c7c76cc3c6b032285bd3898e9b987f5621557e0a316eadff74cda94b553216f96ab1a858b874d120a5cd22ec5c279667a6d1bd9f08e7
+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-6.0.2.2.ebuild 2894 BLAKE2B 235a1ac3e06438e7db7eeedcb99eee169a2ae6847aab83412a6177ad6103e5906dbf5c7cc5b1ac784be9116e4c6f2f061128098e2c9a8d2d3c7fb4e8efc0c2b3 SHA512 ad0ada504cf1b0119ba56c59cc3905b56d03286bdfc01caf4da192a29c2fecd2bb561097143612390299d49507fee29f52defad62c4b3a106f96b5616484a171
+EBUILD activerecord-6.0.2.2.ebuild 2907 BLAKE2B 31a699892d77f34149c7257c66f07f16d42df7f638e133e411b7a667f93fd85e4afb22d0f975d4a20d6e648b2dd55299f18479df1dc8b97c6539ab8e5c9f65a8 SHA512 d38849c3ed1ac04bb6ffdafceb53927ef7d760cefd546610205fd8ec8f26f1e146b61746fcf38529a21f141e4b499b777752666b1d9abaaa6e4073b54a770b64
+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-6.0.2.2.ebuild b/dev-ruby/activerecord/activerecord-6.0.2.2.ebuild
index 377b1fc6cdb9..8db6007cbcd6 100644
--- a/dev-ruby/activerecord/activerecord-6.0.2.2.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.0.2.2.ebuild
@@ -22,7 +22,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 ~hppa ~sparc ~x86"
 IUSE="mysql postgres sqlite"
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activerecord/activerecord-4.2.11.1.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.ebuild
index d5f0d2ccea03..952512d4e312 100644
--- a/dev-ruby/activerecord/activerecord-4.2.11.1.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.0.3.ebuild
@@ -1,44 +1,44 @@
-# 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"
+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_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
 RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
 
-inherit ruby-fakegem versionator
+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="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux"
+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}
-	>=dev-ruby/arel-6.0:6.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( || ( dev-ruby/mysql2:0.4 ) )
-	postgres? ( >=dev-ruby/pg-0.15.0 )"
+	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/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.5
-		dev-ruby/mocha:0.14
+		>=dev-ruby/sqlite3-1.3.6
+		dev-ruby/mocha
 		dev-ruby/minitest:5
 	)"
 
@@ -48,12 +48,12 @@ 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\|mime-types\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/rake/ s/12.3/12.4/ ; /dalli/ s/2.7.7/2.7.10/' \
+	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 -i -e '/bcrypt/ s/3.0.0/3.0/' ../Gemfile || 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.
@@ -63,8 +63,20 @@ all_ruby_prepare() {
 	# this Rails version to simplify our dependencies.
 	rm test/cases/connection_specification/resolver_test.rb || die
 
-	# Avoid single test using mysql dependencies.
+	# 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() {
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 9ff18957beb3..ae6fb3297888 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,5 +1,7 @@
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
+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-6.0.2.2.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-6.0.3.ebuild b/dev-ruby/activestorage/activestorage-6.0.3.ebuild
new file mode 100644
index 000000000000..a866c2b3677f
--- /dev/null
+++ b/dev-ruby/activestorage/activestorage-6.0.3.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 949aadc5883c..7f0f48b95b37 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,7 +1,7 @@
-DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-EBUILD activesupport-4.2.11.1.ebuild 2386 BLAKE2B ae9c03406916c3f16fcd077ef49eea1f10123428af93f1b5e6739a28b1ca741e98b4572fc5643c27b7a8b3efc24bb038f2452df5ea90dc829477affc78a7b0d6 SHA512 b753886b2478c5b54a1800b47096f63ec68489dddb1ca68d72b15f192d6c8a4e345235a76395e6f5c2c3bdd662ea07ba723ac0a025103820afd308a5c9cd18e6
+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-6.0.2.2.ebuild 2396 BLAKE2B 61e908e5176d0297f6ec16cd2dcf6ceab9145addc4124489bd99f8d244509eb5496927b5fb130b121662428610d355939afcff1e9672ddcb3f5f2e80348ab770 SHA512 11c3c6478918250fbb13513f813a2354ac2fa78798b91e29ab136e1ef05e50a9f229940d5218b6b9c2954adf87e204e34d62c2ceaf2a95c64d724fc0fd55f25e
+EBUILD activesupport-6.0.2.2.ebuild 2402 BLAKE2B 8176f2d7e911e93fd8d813dd35d5731795dca4d32d57dbacb7d5677699a339a16821d73902f476552c73659f4049169ed4472f6e5de9591f60cc1ff226116449 SHA512 cfcc9789d8e70cf5f567fa3d3ed47fd924c38e5e1af24bf0f6f299b392d545e25ba03e27f366e01678899d6c12088e18f6ba5ca06953f39ec71092ccfea892ae
+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-6.0.2.2.ebuild b/dev-ruby/activesupport/activesupport-6.0.2.2.ebuild
index 493768eb5237..29e908aae235 100644
--- a/dev-ruby/activesupport/activesupport-6.0.2.2.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.2.2.ebuild
@@ -19,7 +19,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 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-4.2.11.1.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.ebuild
index 4424d718299a..bf4536107f91 100644
--- a/dev-ruby/activesupport/activesupport-4.2.11.1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.3.ebuild
@@ -1,11 +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"
-
-RUBY_FAKEGEM_TASK_DOC=""
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
 
@@ -13,33 +11,36 @@ RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
 
 RUBY_FAKEGEM_BINWRAP=""
 
-inherit ruby-fakegem versionator
+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="$(get_version_component_range 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"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
 
 ruby_add_rdepend "
-	>=dev-ruby/i18n-0.7:0.7
+	>=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/thread_safe-0.3.4:0"
+	>=dev-ruby/zeitwerk-2.1.8:2
+"
 
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
+# 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:0.14
+	dev-ruby/mocha
 	)"
 
 all_ruby_prepare() {
@@ -48,19 +49,25 @@ 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\|minitest\|mime-types\|sprockets\|stackprof\|rack-cache\|sqlite\)/ s:^:#:" \
+	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 '/rake/ s/12.3/12.4/ ; /dalli/ s/2.7.7/2.7.10/' \
 		-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 fails with Minitest 5.4 since that already defines
-	# a string E in its TestCase.
-	rm test/core_ext/marshal_test.rb || die
-	sed -i -e '/test_const_missing_in_anonymous_modules/askip "gentoo minitest"' test/dependencies_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 test crashing newer versions of minitest
-	rm -f test/autoload_test.rb test/core_ext/object/json_cherry_pick_test.rb test/core_ext/object/json_gem_encoding_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/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index c6cbb95851ef..9a14d86dba47 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1,5 +1,3 @@
-DIST arel-helpers-2.10.0.gem 12288 BLAKE2B 04265863ff044a16c9119ce223342ec9007687ff40c7abea3d68328e292b72e0fbddf32756ebd6844a77373bcc3a78e2cb03bb81a9b72737872b4e2e50b3c64a SHA512 e6aa6dacdc36ccef11d665a50e84d9f0a0fdfb524974aa5091b4b11e5d41309153ff4b4bab4c72c3db0c19556f015a438e52c9da4c89daf979a02621622ec3b8
 DIST arel-helpers-2.11.0.gem 12800 BLAKE2B 7e7008049a87e323e6f7919e6104f8ac2bfe5d7ac096557a72a0baec35890721d83f021c62e431ec441aaa6ce7314f312f0ce8b8889da7691a4ba43f09ebbcc7 SHA512 06426cfa8b77ce875af2daddfa6cfe96339fa462718ba1ab7a0f9f759c16ace03aff4c6f0cc6c3fc165df2f55ff024f67247e652cc3cf4c39d07468ae7080445
-EBUILD arel-helpers-2.10.0.ebuild 635 BLAKE2B 888679224d5217be294493abeb3b134ce9d3bfaae30b7947ffa0ef695885e227d66be234174463c3d32ead7627d76a4cbfa0808bcf35399cdb8f93a12f48bd46 SHA512 9ce36edf20d352ae106e2535358589056b40f3896b8814c4e255a852611868e75001e0aad0f6abfc5d7d276ee8e4ecff5e981acbaf24561b2b99e212781f0e13
-EBUILD arel-helpers-2.11.0.ebuild 635 BLAKE2B 888679224d5217be294493abeb3b134ce9d3bfaae30b7947ffa0ef695885e227d66be234174463c3d32ead7627d76a4cbfa0808bcf35399cdb8f93a12f48bd46 SHA512 9ce36edf20d352ae106e2535358589056b40f3896b8814c4e255a852611868e75001e0aad0f6abfc5d7d276ee8e4ecff5e981acbaf24561b2b99e212781f0e13
+EBUILD arel-helpers-2.11.0.ebuild 609 BLAKE2B 4520091d0dfa84da994a1a251dbbfd8318eae055d79f2072472c338e2017b0675d448d46c894ac25e720dd24b140a892319587ac528ac0f17a31bc934c618463 SHA512 5ba180bb9d6683d30cf41461b93c594fa75877698acb4111ad6491fbb965a2b8f5cace0e2f0746c3e3fd4d17244b9f9bbe6e3d61f8f1edc5001e12b9f4874830
 MISC metadata.xml 344 BLAKE2B 3c7611e49af6a5fdfabda583dc91fbe8fc4b7943e774a938e100d91633b3a5c38cefab5973207c25d62a5b8b9e8e7c720b5614c083c8568e532e819bb747855f SHA512 2b4f9f6a7cd7aea5f161da441195d3138810930778d441f0c0d3620fc3de6632088d0d49135e7638553e83db723356184db1abaaf1622999adeec59883087c96
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.10.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.10.0.ebuild
deleted file mode 100644
index d50244168c2b..000000000000
--- a/dev-ruby/arel-helpers/arel-helpers-2.10.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to help construct database queries"
-HOMEPAGE="https://github.com/camertron/arel-helpers"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "|| (
-			dev-ruby/activerecord:6.0
-			dev-ruby/activerecord:5.2
-			dev-ruby/activerecord:4.2 )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rr
-	dev-ruby/activerecord[sqlite]
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/pry-/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.11.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.11.0.ebuild
index d50244168c2b..8b4488aa21f4 100644
--- a/dev-ruby/arel-helpers/arel-helpers-2.11.0.ebuild
+++ b/dev-ruby/arel-helpers/arel-helpers-2.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ IUSE=""
 ruby_add_rdepend "|| (
 			dev-ruby/activerecord:6.0
 			dev-ruby/activerecord:5.2
-			dev-ruby/activerecord:4.2 )"
+			)"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rr
diff --git a/dev-ruby/arel/Manifest b/dev-ruby/arel/Manifest
index 7e0ead4630f5..96cbd2e92c78 100644
--- a/dev-ruby/arel/Manifest
+++ b/dev-ruby/arel/Manifest
@@ -1,5 +1,3 @@
-DIST arel-6.0.4.tar.gz 52401 BLAKE2B 36df892474572863170d51172ff4f2a9e07c7e9a7ae6e65a6eb6878bba78021e25c76b2926a6daeae0f916e4a31999e0cbee88a716a0b82ff799806773745b40 SHA512 65833d68b8adf032ef461ac4b81307e59220a3c7b2c2aa33ed4eaeb830c6d6c379e33ddbcfa53edd5f398fa6a2aef293a4daac7c2c93ed86710bd0cf2b5ff7ee
 DIST arel-9.0.0.tar.gz 59065 BLAKE2B c464c8c52d0fa7c5626fdc9254c74db00e4b43f68f38b75972623f28961565cd6764db967158c48e938620636343b15c4be9bb3237f9c7422730b4702450eb6d SHA512 9d2958765058fa8a4f6a8d7d4c9671d92054748eabe5b94796ff5611cdcd6bb24906cc5e813fb21396aaa681e5703d2d4bce8cc9884f2d057042d1b06bf6f0f5
-EBUILD arel-6.0.4.ebuild 918 BLAKE2B e592e6f7121d59c779cb7bdf8856739315c68f5ebed74f2654f833e6befe6215c5f17e532ad0f8dcfcdcf71508b829a0fa9675a3b76df81fc0549d696929a1f3 SHA512 06f0e3a23917da1b39b18a167c32ea128da13e1d62a7a2b091b133432bcbec2eb09765560ec0ebaf2360f2d8fa385e6bbe30697979f5bbaa5837203d3c3c0707
 EBUILD arel-9.0.0.ebuild 938 BLAKE2B 243c37fc37e6d3e482c9699c7758dea3be49844d01f47480fa7132a96e3911043b877dafecd0b5acf37bfc01089c6e0f002ca4c0eb049401706958c548533060 SHA512 9ac09d5b25cdeb63cab1bd006c9d4c485a0dbf0a25042a444f4925e007f68e5805afabde41a2dd78cf94f642f589ba36404e7a64a1d5ab27585b8e5461128fc6
 MISC metadata.xml 336 BLAKE2B 5949c7e1289105e90d6f23022a41875fd2e8381794b9c63a4eed997f29d08957fe65c7ffaee3076ff7d656abc3068977d9092ee71da204e43514d19e63cbb970 SHA512 f1a6feaa1759411e75d8d11887d411e1e99d2c758b8d8eafb13015a710682b525b4c8b2ca196d2d6de0d7335842a74d28657ff578db015710eacbf4450137639
diff --git a/dev-ruby/arel/arel-6.0.4.ebuild b/dev-ruby/arel/arel-6.0.4.ebuild
deleted file mode 100644
index 683f75acd4d0..000000000000
--- a/dev-ruby/arel/arel-6.0.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="arel.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Arel is a Relational Algebra for Ruby"
-HOMEPAGE="https://github.com/rails/arel"
-SRC_URI="https://github.com/rails/arel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit:2
-		>=dev-ruby/minitest-5.4:5
-	)"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" \
-		-e '/specname/,$ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/atomic/Manifest b/dev-ruby/atomic/Manifest
index 1465feb48e32..219b93a3f240 100644
--- a/dev-ruby/atomic/Manifest
+++ b/dev-ruby/atomic/Manifest
@@ -1,3 +1,3 @@
 DIST atomic-1.1.101.gem 17920 BLAKE2B 50f4efc215293e931380b6307231279b3c5ca055aa8082fee8575963a68b3d54262449bf45fb1a514dab18f53a1dd9e0467a0f7ac67dea7a45fcce09155721dd SHA512 59c82fa5ec984b7ecd97964ea075ea327511fd4e71cc5ac72d3fb573b777c9fb289f462d022ea1e0256b38dc369c9f7fa7a61b7af877bd06ec94252237111e8d
-EBUILD atomic-1.1.101.ebuild 756 BLAKE2B 458249d6d96a5f58d862ee9b06707650915ed9907bd7effb1dea560d170ab217932b054d6196df870b0cb274b72010642071939906cd7df75cad24ab6959b7c0 SHA512 57ba5f7802986a3018c0bdc20c5443d03205bd37a38b1babe0b49829ed1e82ae6487793a584b0289d9858467a5551d57a17983e6cb54a11828552928e7f900fd
+EBUILD atomic-1.1.101.ebuild 763 BLAKE2B 0604d7a50afe2eda1353e624ec0407ac6e84f3ffeb2c62ee9701039f1f7fd5b0e1d4f6e6564479c0a20ed576227e09d7f88f4dc562fad4dc7e42eb0edfb72691 SHA512 4ab578c02063028b345d716e3829f5425f12b00930a34da0f2ff421dca88feed43770e6800df36ba57e149774c099b44302b09e962a42362b415887da65c31a5
 MISC metadata.xml 345 BLAKE2B 64598e451aa2d3e6225aed11977f43d379ad3d26c0f6366dfee9651544e3c4d565a342d61fd1a2f0d176a5cd0e5f97ad1ae5c1150d97a24ff3472e49eb30d446 SHA512 2fc1039a507f87fab12c537d790d538c6e9abada720edcf9de3748e5d81674f4803221ec940a7f3abc6b12f7c9ec009a2960d88e00b45caf2216a23263e03f8f
diff --git a/dev-ruby/atomic/atomic-1.1.101.ebuild b/dev-ruby/atomic/atomic-1.1.101.ebuild
index 0d3933350477..427fca75a658 100644
--- a/dev-ruby/atomic/atomic-1.1.101.ebuild
+++ b/dev-ruby/atomic/atomic-1.1.101.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/headius/ruby-atomic"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bones/Manifest b/dev-ruby/bones/Manifest
deleted file mode 100644
index a2adf8b32198..000000000000
--- a/dev-ruby/bones/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bones-3.8.1-builder.patch 409 BLAKE2B 0e911869f825608db6eee05fc16969db537fdfd8bdbdc4b92fcaf270b402948fae97852c2830cfba5fafa2e53fdc1cf3e35d0968d0bab6a5848d9a827bb38ed3 SHA512 e27aff9a7ef66986abd10aa999f225a58b9272b9fbd7444f84ccc6de5440282a2a25cf2fb8c85be00ebe317fcff78afd84f7fcf2f3523801e09f533419d8bc91
-DIST bones-3.8.4.gem 39936 BLAKE2B 2d666baa5e3df38e74f2ff45f3edf8f13fcc974e71df850a604c6d93d0015d7d9b05121c2e09b6f2f9af8adb8ccd08b4540784b27bfd466d977e565e8dd3031b SHA512 884eb6d84e121daf576eac427a97d69f3d6dfe1bd9c55fc7d821a0658193cbc3864e71b07af00cb6c629c180fce1faa6b314a6607878b665b62208fc1af7fbc4
-EBUILD bones-3.8.4-r2.ebuild 760 BLAKE2B af1fc01a73d548909f3fb373169f9835686e31757d363a9060287a41d12058165946fe5adebb706e8890d0a49d02394ddf86f14523c132b16251f2252a777de2 SHA512 116567abd60d086e389eb4203707b6bce0c9af474fce9ac6f5a277b919d0314c0c262538ad482a8156f989b660e1391d72fc4630557e6393f9e8c5ab7b48d572
-MISC metadata.xml 335 BLAKE2B ccd4963b83ddeb40acfe1d276cc506a2509ca02c471a9fbda6da01e62b3c9029fb464ae6c37c26feb0d6138b00b8d644a75dca428734f597d3b8b73e69865835 SHA512 a6d0af1ee39b0005ed71dd26063ab49cba872fe4a3a4d4ecc03a423837ec70bdf6804571ac87e41d2c049d3b2dadb03f5fb0ef740ca7daa317fb2f6438b2c212
diff --git a/dev-ruby/bones/bones-3.8.4-r2.ebuild b/dev-ruby/bones/bones-3.8.4-r2.ebuild
deleted file mode 100644
index 444e1d22f300..000000000000
--- a/dev-ruby/bones/bones-3.8.4-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="default version.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tool that creates new Ruby projects from a code skeleton"
-HOMEPAGE="https://github.com/TwP/bones"
-
-IUSE="test"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_rdepend "
-	dev-ruby/builder:*
-	>=dev-ruby/loquacious-1.9.1
-	>=dev-ruby/little-plugger-1.1.3
-	=dev-ruby/rake-12*"
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}"/${PN}-3.8.1-builder.patch
-
-	sed -i -e '/rdoc/,/Gem::Dependency/ s:~>:>=:' ../metadata || die
-}
diff --git a/dev-ruby/bones/files/bones-3.8.1-builder.patch b/dev-ruby/bones/files/bones-3.8.1-builder.patch
deleted file mode 100644
index b676c33a039f..000000000000
--- a/dev-ruby/bones/files/bones-3.8.1-builder.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/lib/bones/gem_package_task.rb	2013-12-03 19:04:22.577553656 +0000
-+++ b/lib/bones/gem_package_task.rb	2013-12-03 19:04:36.576377667 +0000
-@@ -2,11 +2,7 @@
- require 'find'
- require 'rake/packagetask'
- require 'rubygems/user_interaction'
--if RUBY_VERSION >= "2"
--  require 'rubygems/package'
--else
--  require 'rubygems/builder'
--end
-+require 'builder'
- 
- class Bones::GemPackageTask < Rake::PackageTask
- 
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 70eb339ed6b1..bc534f7408d7 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -4,9 +4,11 @@ DIST capistrano-3.11.2.gem 69120 BLAKE2B 17c31ce8bc78540167c11313bc75d89591041e2
 DIST capistrano-3.12.0.gem 69120 BLAKE2B d7556022025560dd00a89710daea07c40270650f72d37d990dec201c779b1d69f8250b827b25495bfc1055fe4d0ffbdd5d66bd6686405c16645d79f824fdbef9 SHA512 7b90a366a48e4aeef97e9a51d0907a0f5aa27d7c0602ae80b503735496d0a0302bff0208e678f5a4d186caa9f8f02ad81953a6c378e13dd91f160f59f74fcd18
 DIST capistrano-3.12.1.gem 69120 BLAKE2B ba465fc3eca0ed8917d7b8d5aba0b43017f8a6de17e2734ed654c66cfca6072e68cb2db7414b19bc2f60901245207d4cff067dc0e7b82554e118d306816eac73 SHA512 cddbf583f57af2961fecacc59249d43c15393c665e9eaaa493553bd29f88f947d73a449bdabfb589db78caee4bdcc706ab3adc021a75893c31c79c7e0ebb2ee3
 DIST capistrano-3.13.0.gem 69120 BLAKE2B 394f60d9a3acfef44eacef356908d10d5c7f64010d644fbae988e399b1b8cdd07c1d93b4a6a4894816dc94bcf61180a2bd5f4663b1f014a64ae07ffb82252a90 SHA512 fe7cba9ecfe54d9f8c557dd4e1f8b1ed1269c7aa1e8c687d55fb035b3666ff92ee93895610f0582d139dec56a78c84754208e2aa99d6fc3f4f46c3d45142e2d9
+DIST capistrano-3.14.0.gem 69120 BLAKE2B e9c503a43cdb5f943c84882cc728cf4004afae194a94de763872c8f20eec80a9b6fc05c723cbab0e5ee41d87cfca8947ea62a28ca1d32e6bd2b86f52d1ea859c SHA512 5f117a6efec1a35a188f1ea57f1738bc41bdf3614b77a61ca2e941480d36d74e392400543948a55c054871beb88563489115bb69fb34bfb9f0c32a371966cd42
 EBUILD capistrano-2.15.5-r2.ebuild 1243 BLAKE2B 8407e666498857250b1413411137ee58a11f37533df500f3929801ad1337e72764dbe7be710eed9615a59c65b4e27dac853249e338c7163965f1aa0d6a3f5069 SHA512 909ba2dd134d225dd8272913845d6d1f80f25bea41f589597b1b9aad18d1957ad5aaa269dd9e39ad2bc27037d1c4d4d96a7fe1213c4c7ad55a1c7bd53c8572a3
 EBUILD capistrano-3.11.2.ebuild 925 BLAKE2B 4646005c51f55dacc6142c68f5fa35c6a9b35fd5cacb4f10f5c7d1bf662f2a005d53caa97d7c2d859145f5c0d79ca1a6c2e3d043edecc8a59dfc0a100be07112 SHA512 e5a5475335242113c096e4945ba74b9667d84ce0146f605aca880d4317b770fa1f2ea4773aeb22504cd7be9cdb394f9dacd056f6ed477980d9a9e575acc8561d
 EBUILD capistrano-3.12.0.ebuild 926 BLAKE2B a4d7e28359be35573c458107ba17d05e6470f367dc1c71bcdb5809be0e128ceb6129775850353cb8f7ee0a22d992c9158fa6888aa7a474113e7c58f5e12f6e30 SHA512 4d64494fe679729de181bd24d508f9689a3479e18d726960e87599ccdc4b8b8a89cef120aeea24ed9dbfe3fb1e37fb628a78a614d7ef48045e84fd8cabea8360
-EBUILD capistrano-3.12.1.ebuild 926 BLAKE2B a4d7e28359be35573c458107ba17d05e6470f367dc1c71bcdb5809be0e128ceb6129775850353cb8f7ee0a22d992c9158fa6888aa7a474113e7c58f5e12f6e30 SHA512 4d64494fe679729de181bd24d508f9689a3479e18d726960e87599ccdc4b8b8a89cef120aeea24ed9dbfe3fb1e37fb628a78a614d7ef48045e84fd8cabea8360
+EBUILD capistrano-3.12.1.ebuild 925 BLAKE2B 4646005c51f55dacc6142c68f5fa35c6a9b35fd5cacb4f10f5c7d1bf662f2a005d53caa97d7c2d859145f5c0d79ca1a6c2e3d043edecc8a59dfc0a100be07112 SHA512 e5a5475335242113c096e4945ba74b9667d84ce0146f605aca880d4317b770fa1f2ea4773aeb22504cd7be9cdb394f9dacd056f6ed477980d9a9e575acc8561d
 EBUILD capistrano-3.13.0.ebuild 926 BLAKE2B a4d7e28359be35573c458107ba17d05e6470f367dc1c71bcdb5809be0e128ceb6129775850353cb8f7ee0a22d992c9158fa6888aa7a474113e7c58f5e12f6e30 SHA512 4d64494fe679729de181bd24d508f9689a3479e18d726960e87599ccdc4b8b8a89cef120aeea24ed9dbfe3fb1e37fb628a78a614d7ef48045e84fd8cabea8360
+EBUILD capistrano-3.14.0.ebuild 926 BLAKE2B a4d7e28359be35573c458107ba17d05e6470f367dc1c71bcdb5809be0e128ceb6129775850353cb8f7ee0a22d992c9158fa6888aa7a474113e7c58f5e12f6e30 SHA512 4d64494fe679729de181bd24d508f9689a3479e18d726960e87599ccdc4b8b8a89cef120aeea24ed9dbfe3fb1e37fb628a78a614d7ef48045e84fd8cabea8360
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano/capistrano-3.12.1.ebuild b/dev-ruby/capistrano/capistrano-3.12.1.ebuild
index 8fbec0f004ec..194a24709889 100644
--- a/dev-ruby/capistrano/capistrano-3.12.1.ebuild
+++ b/dev-ruby/capistrano/capistrano-3.12.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://capistranorb.com/"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/capistrano/capistrano-3.14.0.ebuild b/dev-ruby/capistrano/capistrano-3.14.0.ebuild
new file mode 100644
index 000000000000..8fbec0f004ec
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.14.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+
+	# Avoid specs that require a TTY
+	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
+	rm -f spec/lib/capistrano/configuration/question_spec.rb || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 1aa658850aca..149ee11e5562 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,15 +1,11 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
-DIST capybara-3.28.0.gem 355328 BLAKE2B f9f71a3cadf5a88c86f295e02da61d7ae6813776afdc64829c72ba9ba3a6127c34e4016a152dafc337953c4d69c35f222504bd86e3bbc5f93562f7bb3ae41746 SHA512 fad8a3e6fd95c6ae03ef223001175eab59033bcc65555f708dc8efefb48f0323fbfdfedcbd304ec69e9690cee5e95640b9c43fdc93d6e01696425764b51d96df
-DIST capybara-3.29.0.gem 358400 BLAKE2B 1e8e6077cfaf189ef511367fe6c14da42a73729e02aac7461897d07210fc583ebc604dc3d7f763f90ea0fe30c139850a8ff2236434ec4f3492d9fd0892aac692 SHA512 6793ae8fe0fcd04e0ae5128dadc57e807f14673b3b92703eb3fd8016a66647f36acf53566ad938516e8ab5a09135db53825219ac81c8ced55cfb2470923aa019
 DIST capybara-3.30.0.gem 360448 BLAKE2B c20173448903f96facdba007b81b43d74500a0e8ab1e15b9bef938df426ff8098a1fb54a3791d92d0342b594d609ca48b9d8c1f67a758d8164fbab2f5dad3bd6 SHA512 f10943a8f10c0a058d0737fd15814d4ff6e50dd4df2627d20f4646c13bb52dcd0e1042193525252d0009e637c52118ce030968e4451f823076e59b7fcd4cb90c
 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
 EBUILD capybara-2.18.0.ebuild 1529 BLAKE2B 2c82eac2f07da03522e3d5cf719171ca3b81dc08b516ee37a9dcde586d5257fce47e8ca2c0a82de966ee79c19ce84772035e89efc1e28f97f240e54e64e75e50 SHA512 8c02414c863ea3a380821c127c3b8175f1a38ccf7a19abfdb493d702acce171e915bc76cac2ea94acaf1649647386bd78af1c80272fb6294246462c3c42a5d5d
-EBUILD capybara-3.28.0.ebuild 1775 BLAKE2B 0e49c41c3fc31d4f1248fb37c61881cb4fb5f83687e8d352faa0d8edd72727694815f46a31a3df0c1fc2ba1ca74e3dfc474f3e8756d5da36110c9efeb10d9df2 SHA512 3941d06877404c2a4d2d878598cc32bbad77e897b342d07e2263cd791e5e30df8102334d1068a23f2d4383fbe6023eee7bc1a04c187d52d766763789f7093f67
-EBUILD capybara-3.29.0.ebuild 1776 BLAKE2B 9a815db558101d7bcc07fb33ae50303ca2533905604c7a32627a96a8e6d89d00c1892c5e7eeda3809212310e18f8c4d285d0e430dc2e3e702f3b28ffbfdf84b2 SHA512 403f017726785f83aef36aa0b7ff94c8bde97a2b890123c4f63c30d2593c6041c954325f094a5c46adf5ddc657e370c0e9d759d8ceb5b50dabab91fb7c6bb50a
-EBUILD capybara-3.30.0.ebuild 1775 BLAKE2B b86cf3daaea507c38e5848980ac7422f3ce7515554a87f756788d88c9b3e4b266f3b05fdbc9e4f582b4f9cfc78bcb8edf631dde730226669c4838b334135e9b7 SHA512 4613b8beffb4650aba64a2ab7266d71f72d6a3f982bb960f919122132e8815ab0fd63cc9f039ef12bc6d90bd76c6339a3a5d4a189fe9907256a32ec5de01ff4f
-EBUILD capybara-3.31.0.ebuild 1783 BLAKE2B c31f70bc1292b15cec178768b4b8e34fe564abb1d19e6e7411acae54470faf928565b97620bf77d7ad4350cf17ec1778ecca67ad545bbae726908bb18304c27c SHA512 05c0e188b5d197bf7e30064a2d9d219574e40fc3838239cad2fca43122b4cdf8e1460027a05bf5774b2c206aed5a7795c44680905f1790329486995c8f3e82fb
-EBUILD capybara-3.32.0.ebuild 1783 BLAKE2B c31f70bc1292b15cec178768b4b8e34fe564abb1d19e6e7411acae54470faf928565b97620bf77d7ad4350cf17ec1778ecca67ad545bbae726908bb18304c27c SHA512 05c0e188b5d197bf7e30064a2d9d219574e40fc3838239cad2fca43122b4cdf8e1460027a05bf5774b2c206aed5a7795c44680905f1790329486995c8f3e82fb
-EBUILD capybara-3.32.1.ebuild 1783 BLAKE2B c31f70bc1292b15cec178768b4b8e34fe564abb1d19e6e7411acae54470faf928565b97620bf77d7ad4350cf17ec1778ecca67ad545bbae726908bb18304c27c SHA512 05c0e188b5d197bf7e30064a2d9d219574e40fc3838239cad2fca43122b4cdf8e1460027a05bf5774b2c206aed5a7795c44680905f1790329486995c8f3e82fb
+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
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.28.0.ebuild b/dev-ruby/capybara/capybara-3.28.0.ebuild
deleted file mode 100644
index 93815b6ec366..000000000000
--- a/dev-ruby/capybara/capybara-3.28.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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 ~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/capybara/capybara-3.29.0.ebuild b/dev-ruby/capybara/capybara-3.29.0.ebuild
deleted file mode 100644
index 3977cb133865..000000000000
--- a/dev-ruby/capybara/capybara-3.29.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-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 ~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/capybara/capybara-3.30.0.ebuild b/dev-ruby/capybara/capybara-3.30.0.ebuild
index 5dfe4a7a1c23..38b2db211d8a 100644
--- a/dev-ruby/capybara/capybara-3.30.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.30.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.31.0.ebuild b/dev-ruby/capybara/capybara-3.31.0.ebuild
index 3b7cbce5d8a2..fa400375c0b3 100644
--- a/dev-ruby/capybara/capybara-3.31.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.31.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.32.0.ebuild b/dev-ruby/capybara/capybara-3.32.0.ebuild
index 3b7cbce5d8a2..b68f23f73e1f 100644
--- a/dev-ruby/capybara/capybara-3.32.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.32.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/capybara/capybara-3.32.1.ebuild b/dev-ruby/capybara/capybara-3.32.1.ebuild
index 3b7cbce5d8a2..b68f23f73e1f 100644
--- a/dev-ruby/capybara/capybara-3.32.1.ebuild
+++ b/dev-ruby/capybara/capybara-3.32.1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
 HOMEPAGE="https://github.com/jnicklas/capybara"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 SLOT="3"
 IUSE="test"
 
diff --git a/dev-ruby/certificate_authority/Manifest b/dev-ruby/certificate_authority/Manifest
index 757a37a6927f..df76838d098c 100644
--- a/dev-ruby/certificate_authority/Manifest
+++ b/dev-ruby/certificate_authority/Manifest
@@ -1,3 +1,3 @@
 DIST certificate_authority-0.1.6.gem 22528 BLAKE2B 85b229c7506b787b85b734883967dd8e6fc4ceece57dec2b2b8c29fffbaec2d95931af5412d61ef9935e547b68b14213e5cc6971f94ad6294476cc653684742b SHA512 d1471171aa01956ca216bdb8515e9f6fafc9720827e7351b14c7c38907e87b66a3299d9ee0322fb51b8edd1cbc4f4a73a2aa4b54ff5ca4c8bc602ced5e035a59
-EBUILD certificate_authority-0.1.6-r2.ebuild 762 BLAKE2B ccd58de4c4c738947d70a269b7d1a0bec0407153e9ce9ea43586c41079becc40061ce7832d16ae07f938335a503c798f7bb915a8016f5d55086f974ae07279bd SHA512 f5c848a65454f1a5f522de0eb1c7f6e610267ad0e53f6d76930d125610c52a4949c0b07a8fbe4a77f691627320f398d1187a183db7e5ac19fc4d6f4418ad9b63
+EBUILD certificate_authority-0.1.6-r2.ebuild 769 BLAKE2B c58170c67cea3905725ae6add40477d403281c33f12c33088d5d880fe83f13797746c71edda58547bc0b0bba59fa76fdc91b0da42fb0ebf9acb21b2d6af23607 SHA512 2ce877bf95e8d45bb5770939c3a940e361e1c075e1e2bf2a1907f2c3eeed96fac4e3e51df5eb0996c7d4d404302af94c2788201363ab4768b08a42a679f33eba
 MISC metadata.xml 357 BLAKE2B 5e69b9b9001e7dcc322333c2cc3f451afded531e07b9942eac2dc59a6c61ceba864f2799487345cee4b5b0540b5952c7c312dfaa9e20f9b1373c4bbeac57c33c SHA512 e0e2a1493426c800a142ccf475ab1d0ab60511b30c28fd6bc927d9672281f6377eaa607596acb6b9b1fd2b949231b4a1b01ce8137725f5f4632ffaf7b62eb932
diff --git a/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild b/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild
index f161bcdd6b56..43c165587699 100644
--- a/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild
+++ b/dev-ruby/certificate_authority/certificate_authority-0.1.6-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=5
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/cchandler/certificate_authority"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/activemodel-3.0.6:*"
diff --git a/dev-ruby/classifier-reborn/Manifest b/dev-ruby/classifier-reborn/Manifest
index f35303ec578b..2746b0a964b2 100644
--- a/dev-ruby/classifier-reborn/Manifest
+++ b/dev-ruby/classifier-reborn/Manifest
@@ -1,3 +1,3 @@
 DIST classifier-reborn-2.2.0.tar.gz 319010 BLAKE2B f4bd3259b9d6e324f3f0feb06dfd1c8736eaa8ae0f687e488b6e11b9cda8e6bf9e56a175c01dfb9352184da1a030d1330e22917c7bfdcb4242fa0102f6291940 SHA512 d299ce8f3b96de5c6194e816d880ebb895faaacdc2a19985166bdc3d9760242ec41d85f22167ea66e9afd743f5d91d63881da02882d1a412fc95a0c5db63d04c
-EBUILD classifier-reborn-2.2.0.ebuild 1026 BLAKE2B 4ae4c8931e1c9acaf8dcb1ceb6f8026969e957c01cdd1cdd69c4484c4bf97da7bb9769c9a51e5e78f4a866c87a44400448e273726179aa25e3e4394d27d938a6 SHA512 ed79ce37edce20fbcc883320c7f3ef12d40597949f371df35782cd84afa94050f0bd9faf14ee6a137550ac6f12493bd919bba9ff21ebfe625c6133e4fcb5dd52
+EBUILD classifier-reborn-2.2.0.ebuild 1030 BLAKE2B 3d96f63dd041b3dfd427f8730427ee72905911ea68cb51f644ac0190ed0277cc56569f2c49b02e1c80072a44fc95d6ee061b544b97ffdfffdace0566d3eebb03 SHA512 db45713d874fdf5e8633423d2b6b28c08506e913be8acfb5da767b1b987a2afadd236b921879e1c176caae05eb38831ba125cba40d1857fb313b038edba8797e
 MISC metadata.xml 350 BLAKE2B 91cfcda17c5879371a12e7faea70e149ffb7478408043f887f028ee862b7170269320f193746be9466cb7b4538898669e98a182b92731ece55ba97ac21d82465 SHA512 defb2af66dc0a90b83cc127144db7932659ce36beda28f59ea1fe693843fa3c41dd584f53b9ec6136ae2470aeab4ef191621e84862f97c33a736eae54d6c5a71
diff --git a/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild b/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
index a4930c294bb5..37cd17f902c1 100644
--- a/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
+++ b/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
diff --git a/dev-ruby/cmdparse/Manifest b/dev-ruby/cmdparse/Manifest
index 37a98cb1c681..e28cf66a5f37 100644
--- a/dev-ruby/cmdparse/Manifest
+++ b/dev-ruby/cmdparse/Manifest
@@ -1,7 +1,9 @@
 DIST cmdparse-2.0.6.gem 53760 BLAKE2B eda157aa8f8d4fce31df8944524dbf7f8c9d8f8764bf5fc85de044d50e20be0ba408e45815916389e77b6a42787d4ae00577ceeee66ff0fb46e4526f8209ba56 SHA512 c4120b049e7d42d65be80649cdd097d17f8a732f090382759351617225f6235438f4338466e5e8c7b5c35675ca43d4930dc39b357263062ba7ae9c61c85f472e
 DIST cmdparse-3.0.4.gem 54272 BLAKE2B cd5c91f810937192a3c6d8895fa4d4e323b51b76e2641e2a93a9dcf7df04a93f86dfe88b1df0e9bd6ca2e1088d02304789eef8fecf8d7e7764266306cef8126b SHA512 f1a36d42de42c7bf06f160d31f44323ab588736e7e5b0ffafe05253ec1d9fe0990e8e1a004b47f82b1316154ac1459a6145a52da5a1e2e32e1c548bb5f37401a
 DIST cmdparse-3.0.5.gem 54272 BLAKE2B ff037ffa8b55e79e629eb0a802bc1ad4567e927bfcf42258372686a39cc5471ec3e08b97172d5321f5e559eb9c5ec974d62937884a6ef6ce40a4130121c8d100 SHA512 841803929ef24f12ba90fc9545e9b5d1f7c2343ed7556564d5c5d72883256a7690f710fb864d915625393ea29cb1bd6667fa5466087b14a8998e5287a14834c6
+DIST cmdparse-3.0.6.gem 54272 BLAKE2B 04d1ce8a10a716c913eb6def6e6abd72c4ca5aeb2f761c0fd84d95cce524d853f89d959d2babf078e313b4f7ca738ce7bb3da1027c77c0811cb7c81bf89cb6cf SHA512 c097d0d85c4da423d393bfef875d214221543db19f1fa8f66ea711090e468a67250480ecb8c113d29b77173cd48e809cd3afb5a810cd62986abf066a568515ca
 EBUILD cmdparse-2.0.6-r1.ebuild 517 BLAKE2B e34c932994c5e221a0124094e7cc2511becf81a53f020597d54487c86632372ce3ea5a92923330b7ae8597db23d220dff4d0f468f08e7a244a133f17395fbfd0 SHA512 141fe44acd2a2b129335f87e6e6662b3baa84483a7791e2248ecd87ec4da3636ed91eaff860616cc4a8296fb7bf92aa450d2dd3adbce7234933f3efd8fe40d85
 EBUILD cmdparse-3.0.4.ebuild 437 BLAKE2B d99374211b9ad861412edf93475e7a7d32a17aa42e1da99c839633bf21d4582e281e7b70d61b3417f7b42246626a14cd90a22b54154e8a42e9e40419849dc166 SHA512 54b45c36d40264fd9cc09eb80094679e04d51f50c9d7f469fb6ffebaa7c698be720d7912904482450d145c85d152a59257ac7b024657e5628d9b87156205fa9c
 EBUILD cmdparse-3.0.5.ebuild 437 BLAKE2B 029bd3d492ff1835eb198ee5ddbd0d0342313d8ce66496449d91b0c7dbc0542c2bd74971a397fb454b68ef5a930e82185b05ce113682f0b3b82365b8bbf9eab4 SHA512 9f787d4ebcfe209c8d8023809ce32c00a62dcf02da1150df7fa4dd547da9b5b8bb1e667d999ae9cdffbf8f77449ab28fa57f38a838dff6050cd94322a9609f68
+EBUILD cmdparse-3.0.6.ebuild 437 BLAKE2B 029bd3d492ff1835eb198ee5ddbd0d0342313d8ce66496449d91b0c7dbc0542c2bd74971a397fb454b68ef5a930e82185b05ce113682f0b3b82365b8bbf9eab4 SHA512 9f787d4ebcfe209c8d8023809ce32c00a62dcf02da1150df7fa4dd547da9b5b8bb1e667d999ae9cdffbf8f77449ab28fa57f38a838dff6050cd94322a9609f68
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/cmdparse/cmdparse-3.0.6.ebuild b/dev-ruby/cmdparse/cmdparse-3.0.6.ebuild
new file mode 100644
index 000000000000..5312b37121c9
--- /dev/null
+++ b/dev-ruby/cmdparse/cmdparse-3.0.6.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_TASK_TEST=""
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+IUSE=""
+
+DESCRIPTION="Advanced command line parser supporting commands"
+HOMEPAGE="https://cmdparse.gettalong.org/"
+
+KEYWORDS="~amd64 ~ppc64 ~x86"
+LICENSE="MIT"
+SLOT="3"
diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index 84f80c09388f..0dfc2a02dacc 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -3,5 +3,5 @@ DIST cool.io-1.5.4.gem 112128 BLAKE2B 49ae41e7ab3481609952d0234e3303d195f59d3a7f
 DIST cool.io-1.6.0.gem 112128 BLAKE2B 829a2ce47342b4611fb76457836935e26902e5849dd7c43aae297f1d4b220c30020478d3176d15c179489be2ceb504da218b123d04cd6639a7b99e8a185f51eb SHA512 d6ef51ef15b804158b5d84a6a774368513e787d0bec12743d3ebf0c634d40b1fbfe213b5b7c484a1f3de0aaf894e5edb3072e39452d53886b00317a368570e76
 EBUILD coolio-1.5.3.ebuild 1446 BLAKE2B ef4f22668b4adcbe9b16a542b94723501cd4c13d42c0b819e9b36a33f9a57c0a3980df68c11889ab5629ccfbd5659b556fb0ed61764e3d950fb588b7b73b2764 SHA512 31b73ed4644895c34a11b9926aa96a5c1fbe462de16b13a8d1fb47e26bb5055a25fef293e33b8a036e959a4162fd027d04ea43177477da198aa80a34e6f700ba
 EBUILD coolio-1.5.4.ebuild 1446 BLAKE2B ef4f22668b4adcbe9b16a542b94723501cd4c13d42c0b819e9b36a33f9a57c0a3980df68c11889ab5629ccfbd5659b556fb0ed61764e3d950fb588b7b73b2764 SHA512 31b73ed4644895c34a11b9926aa96a5c1fbe462de16b13a8d1fb47e26bb5055a25fef293e33b8a036e959a4162fd027d04ea43177477da198aa80a34e6f700ba
-EBUILD coolio-1.6.0.ebuild 1439 BLAKE2B f33b40fdacc080162a17c732a975ab7589325d3cc3868e69dc96788f2088182fce4f3eb5426ffd5ec5464a835e1267b20e067f25adf872d7f5e6ce30a9e1dc3a SHA512 bb27eb74647e4f69ff90c7d02b20bf2afbd70db65b7811b0cc6a0e7504c221b07d53d1365b2f3c776eeb7f1004fb0083a4ef8a3289149b9b7f1de3975d0476a3
+EBUILD coolio-1.6.0.ebuild 1446 BLAKE2B b02a2812141f06849746a78cc80d80f976d551b757ccccd6fb538166b05eb4092e513cf78fc5309d392aec224ec31c7456c54a9ed84608403838df0248d15a60 SHA512 ccbdf45fb33cc23061d8b59f61db20e43a4218bc11f3cab834c890b72e49c785f3d1bdc1d31033fb65b97124f54335a9cec0d4fe8a17bac31d7673da5100fe50
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/coolio/coolio-1.6.0.ebuild b/dev-ruby/coolio/coolio-1.6.0.ebuild
index 637257328a79..cb36a9e516af 100644
--- a/dev-ruby/coolio/coolio-1.6.0.ebuild
+++ b/dev-ruby/coolio/coolio-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
diff --git a/dev-ruby/crass/Manifest b/dev-ruby/crass/Manifest
index 1cb4b83b3707..ad4aba46911f 100644
--- a/dev-ruby/crass/Manifest
+++ b/dev-ruby/crass/Manifest
@@ -3,5 +3,5 @@ DIST crass-1.0.5.tar.gz 88665 BLAKE2B cf7cb01516a9d7ef21839b8b0cb2d7ce8a8f6fbcac
 DIST crass-1.0.6.tar.gz 89443 BLAKE2B 2721cc6f5419a36c122c63c59804da84791e70d522ee01ff2ff06fed67a74ab187d0b601cd85e031fd33a84315fbc4cd092c14de110053c94ff0e50d4feab5fc SHA512 de98dea48d0cff148b3000d7388256552d1bf5a014ecbc074efc909473bc6edf2cf1db36179aaa4284eb810618dafc346757ac61708c9659045e013e6c6d4e36
 EBUILD crass-1.0.4.ebuild 692 BLAKE2B 28bffdc99989e0cf374abac974716c822ef7d41f1a25570e98b38239a679973f10c994871911c5417733d0a998851f3a36d1820deeca5993d77ef0af81ff8ecf SHA512 4a9be7794d0ada899fe4254020ba9b1b245319adfebbeded44bf6fc705d4d554c0b3e137e2366242d1d02460007d1b2c3892e2d5eeb3accd8fc9fb8e16f6d8b9
 EBUILD crass-1.0.5.ebuild 848 BLAKE2B 19b057d1489d7ef19f882e6db29126f23568aa4db52d73488e72efbea81130e6457c721c184a42a9e29eec9271247d61980a3e9f66d7989e4d2a1b8fd758eb4d SHA512 2729dcc32aefe405cd001868c5e8abc98cbfadd3740c6fa033dbc3c3060eeb7352fddb28cb998f9f99f6315b829eeb268d2f3cbd6881a2cbd91119329b3cf8a3
-EBUILD crass-1.0.6.ebuild 855 BLAKE2B ef6f4932241d955507ab3d17c5ca0daebf8b4fccbd7dcba6b20b5bd3f0b38c551a99d3dd211d7b69ceb716d96440b64b66fb85181733e5f2ca36abd8d78056f9 SHA512 8d6ad8405a3dc40c0dd17b58bea53bd5329abcf98eb5f9b8c052673ebe272eb87d2ea27f596a2de779567bf4c245f55ad8cb6a9ad1ccb132d999925df0fd2ad5
+EBUILD crass-1.0.6.ebuild 854 BLAKE2B d653551eebe92f5bd8b1b82458b6ab9f4d9decb60e78d9a50bf5a1bc81e15b25438ff0cc11df03d2b85de344f60f918f03dc6dd45330bfbcd4f182981f5842aa SHA512 318c9cd1880ffa2faa84cb232355f82c3b49b9b9df9d775ef7efdcd2c712c4c39727f1c6ed4249601e683e6edf5b22715c4e09d5e12eac6f78f66388282c3643
 MISC metadata.xml 338 BLAKE2B 7c67c73b8424d0f83d98cbc7b2c8608ae80829f5f59029a143132b0669a44eefda849bc941a34b143e0dcb3625be05eebe02a4176c219525ee3fa151676766fa SHA512 fd48781e866b789fb7b938ccc47d70a6d84af2afd104aad532d12b81c9235c3fe00c44546d8724d2c98a3e7808b62adbcd50b065e795cc634ae4fcd0eb711247
diff --git a/dev-ruby/crass/crass-1.0.6.ebuild b/dev-ruby/crass/crass-1.0.6.ebuild
index cd10b091fd5c..c700c29b7c2e 100644
--- a/dev-ruby/crass/crass-1.0.6.ebuild
+++ b/dev-ruby/crass/crass-1.0.6.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rgrove/crass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend ">=dev-ruby/minitest-5.0.8:5"
diff --git a/dev-ruby/date_validator/Manifest b/dev-ruby/date_validator/Manifest
index 9bc68c686ee4..bf0f80b0b6d7 100644
--- a/dev-ruby/date_validator/Manifest
+++ b/dev-ruby/date_validator/Manifest
@@ -1,5 +1,3 @@
 DIST date_validator-0.10.0.gem 12800 BLAKE2B 0cbb11e70cb72a1203c2ec33581d4ed48be346af6998faa89e4323c8c6bf70b5c979b55bc79630153a940697c89ce140eb511538cd55adb0f12566f2f1a317a9 SHA512 4348835898ebfe311a8ea456adc10f7bbfd1dc21daf2678e32b1615ba3eef3d36671f67f533109882f40516c836f23d7e0a4072c9ecaa55a1b0eade0b6aa75b7
-DIST date_validator-0.9.0.gem 12288 BLAKE2B 1a180a88ce4669a29381fae8c9a2407a9026404d0aa2d7be24566ab1f35dfc4a2c17c0c06556c3388e49198dc6bfc11425c2f899c46bcec8a39d6b284269b4e0 SHA512 da7c06d22375cb5ce0e3a1c7d8c84d03c60f5564329d7a6adca4448d386bd26341786e97e6d74d6c7ba820c4437fe88f6dea1e20312b07714f28557bb863c051
-EBUILD date_validator-0.10.0.ebuild 1004 BLAKE2B d8056a5a794f3761a4b6ed0990252cda8a4c1f01a0e690745a5df678a097c1657d6018072663028dc328950c2202db2c4fde5402a76837021c31940fbf56f65c SHA512 f37d37ce7e106ba9996f90c409a5fe2b09e0bcec7a1740fb41bb1c79ee0d615cb15e1cdfdd92e632ccfd4e475257eff3690ed8c116450a2a487b6d2d3fd5cc07
-EBUILD date_validator-0.9.0.ebuild 1011 BLAKE2B e8478dc6d4152453534dc22cffc09c9cf83c242ee93cc8c4f009fc0121865dbf31cb8bfcceea539122cd873451d7fedf5712f6f6c101b159107b62f7519956e5 SHA512 05f4c81021906f7ae1651c6323f2dd9343038a94c2fb95163dbf299d2858220b7057d10df82810f40c52cac9d30e5f42fde7e8ff2db053a56ca55a26f07f1eea
+EBUILD date_validator-0.10.0.ebuild 1011 BLAKE2B 1af95791b5f4465194f7bbc930af63c7a3f0aec2b1962550248a79fba6d6d02ff0214ed1832cb2b4af62174959890a80a3d156acc3c3555ba9bf0512981cd892 SHA512 fe047ee599272c7c9e51e2b76589d2b7236b906f614bd9f29cd88494d7a48650f6a800052590e0a61a620ee7af0bf004f7aad6363d7e73f6d330cebae0ae6639
 MISC metadata.xml 349 BLAKE2B 4b120116447656e42f1247065f08006f19da25e019491f904eafeb12ce35bb012f2c0330d8ff219f7c2ac72e4c0423b93a2a3ffee36da1de08454c6306856722 SHA512 67be0f0ac5cc6bae9b3d76a371bcceefc5c32c4a384a02f7f13a0fa1da950ff864a106430922a3aad2d8b5522a216ad6d93eba949ba1bd76f37926abc40fd6c8
diff --git a/dev-ruby/date_validator/date_validator-0.10.0.ebuild b/dev-ruby/date_validator/date_validator-0.10.0.ebuild
index 59f3bc14b2cb..474a36c5ed7e 100644
--- a/dev-ruby/date_validator/date_validator-0.10.0.ebuild
+++ b/dev-ruby/date_validator/date_validator-0.10.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_TEST="test"
 
diff --git a/dev-ruby/date_validator/date_validator-0.9.0.ebuild b/dev-ruby/date_validator/date_validator-0.9.0.ebuild
deleted file mode 100644
index 6a8969c17220..000000000000
--- a/dev-ruby/date_validator/date_validator-0.9.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-# if ever needed
-#GITHUB_USER="codegram"
-#GITHUB_PROJECT="${PN}"
-#RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3"
-HOMEPAGE="https://github.com/codegram/date_validator"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activemodel-3.0:*
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest
-		>=dev-ruby/tzinfo-0.3
-		>=dev-ruby/activesupport-3.0
-	)
-	doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/git ls-files/d' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i \
-		-e '/[Bb]undler/s/^/#/' Rakefile || die
-	# Fix tests
-	sed -i -e "1irequire 'active_support'" test/test_helper.rb || die
-}
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index aac0ab7c5ab2..7a471b832731 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,9 +1,5 @@
-DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a
-DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac
 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-api-6.3.0.ebuild 1151 BLAKE2B 2a8a26719aefbad975aeece61c818f65d40a0e75fa66b83ba3a9cb0f8cbcfebbe859ceab4e575a93c6204a6551104fc838c5f59fa1362365e1e6d0d39ffb9a5e SHA512 285503ba3f8406053ab5dc18a26133eb80e298853333b67fe254248e3b2b4c9a8f23f1a5611ce5853c3a653c1252a44d7c1a8329bc8766ce47713ff175088c57
-EBUILD elasticsearch-api-6.3.1.ebuild 1472 BLAKE2B b96b03841c716861d2d039e87a78db37a354742e65fc5414cd782856fb6097793c545a91e99dde39268944b613b858f0a861a2e7d8bf19071262c4a3226f09db SHA512 c6a7ceff3c422f029378acd2afd0066fac6b35ac2edd9efd58fa5896d31d5f1275fc43c2db3a2a012fd4ccba01b483f555b4b477cc8eca37fff9869721811744
 EBUILD elasticsearch-api-6.8.0.ebuild 1472 BLAKE2B b96b03841c716861d2d039e87a78db37a354742e65fc5414cd782856fb6097793c545a91e99dde39268944b613b858f0a861a2e7d8bf19071262c4a3226f09db SHA512 c6a7ceff3c422f029378acd2afd0066fac6b35ac2edd9efd58fa5896d31d5f1275fc43c2db3a2a012fd4ccba01b483f555b4b477cc8eca37fff9869721811744
 EBUILD elasticsearch-api-6.8.1.ebuild 1462 BLAKE2B 625c06f2e263292c4907b06f908829047460bccfd7ab4b1e7639c49c2cb821c893fde21c32ac8699ce3672486c2c9b245de5428704bbccb80832f0ec1f90bcbd SHA512 71850eafc5466f9f13a903b89e129f3d395a1b25355086abc1eb5c8a57f65ecafd5020c53c57ba287318f7a03cc2567f5ff4cb17ce766aa31136e51c75f14ac4
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.3.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.3.0.ebuild
deleted file mode 100644
index a29627040725..000000000000
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-6.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem eapi7-ver
-
-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
-	)
-"
-
-# 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/elasticsearch-api/elasticsearch-api-6.3.1.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.3.1.ebuild
deleted file mode 100644
index 4dbb938a449e..000000000000
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-6.3.1.ebuild
+++ /dev/null
@@ -1,56 +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_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem eapi7-ver
-
-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 -i -e '/\(pry-nav\|jbuilder\|jsonify\)/ s:^:#:' 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 edc51838f989..24f62de10e04 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,9 +1,5 @@
-DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a
-DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac
 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.3.0.ebuild 1277 BLAKE2B fc41e8d8e10dd890e5255fc71e5a035a741e4dce0ad9d44e74406defb548b32ea0c483ea23f602a5e2a6d445ba6e3c3fd2bbb34b9bfe6dd34fe8951d6de3a3f6 SHA512 43cf3dd6986e1f4c6fed1417798abb6154b2e269e3279a75bed776a95039691d989ee63fb0a441a34de4d8f4e906163948ec5adf0dc9c7636258b3d787897ec3
-EBUILD elasticsearch-transport-6.3.1.ebuild 1284 BLAKE2B 3288fafe5b6a4cb14dae4055aac032768baa0b344e73aacc266b2f73e4882fe48b38812d3e870bebfdc6fe4644dcf1decafcd9b45ef91776322c06ee4c6203b1 SHA512 3236272c505ada8a99b2ce70ad5fc1609e83e127f5dcf0393565a0443ec0f335e9be2f7dd6456430e434af517253c6d75ce195570a3f384e04ab290c3ac41a84
 EBUILD elasticsearch-transport-6.8.0.ebuild 1284 BLAKE2B 3288fafe5b6a4cb14dae4055aac032768baa0b344e73aacc266b2f73e4882fe48b38812d3e870bebfdc6fe4644dcf1decafcd9b45ef91776322c06ee4c6203b1 SHA512 3236272c505ada8a99b2ce70ad5fc1609e83e127f5dcf0393565a0443ec0f335e9be2f7dd6456430e434af517253c6d75ce195570a3f384e04ab290c3ac41a84
 EBUILD elasticsearch-transport-6.8.1.ebuild 1245 BLAKE2B de79ad2d371cdc49172d4aa835048c11b462c5f7faec0e3512890b6ea36865b15289e46a5b0bff61ab9bf0fb1080d6333ff3c58f15558940112898903bebe4ea SHA512 72c619d7be6141257c7e91f6c436cdd349e0abdced71e93a05a143246ad56f0003a0ed876e53aaceba5b8b3c049cb82c4daf80261b867cd6cb44822f9d3e620b
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.3.0.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.3.0.ebuild
deleted file mode 100644
index 58ea677f3db7..000000000000
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.3.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC=rdoc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem eapi7-ver
-
-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
-	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/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-transport/elasticsearch-transport-6.3.1.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.3.1.ebuild
deleted file mode 100644
index 62da4c569e55..000000000000
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.3.1.ebuild
+++ /dev/null
@@ -1,54 +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_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC=rdoc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem eapi7-ver
-
-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
-	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/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 aa2316b97a0c..055dfd78696f 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,9 +1,5 @@
-DIST elasticsearch-ruby-6.3.0.tar.gz 327308 BLAKE2B c9e5c6b1229dfaa30ecf341de9832c992131c7e3a42253747e1577debc0873b4c6428740c00912affa0cc4e668e0f5b78ac484bec926757ac1a8d50eef1bc996 SHA512 26c36198c66c31c59247d5d63ca817cf7942436b524a3480c69c1860ba3933617c75138521a49e14172d9a6ce6086325d685ab5dba22c99a4767dc85f35eb13a
-DIST elasticsearch-ruby-6.3.1.tar.gz 336484 BLAKE2B b97af0262be1512a5db230f2ad66db52cfdba9c613e4fe89b23b35ae9b038978b043c7202784becdaea7710dbe45c40dfd95a95c5997164ea2f1fcc9c5b363d2 SHA512 184c31ebd6c507ceb11273eac950ab9dd168fcbccdd7b0c1956603a2e5e587eab767c2dec8203e90d919189f6f6e27a11d847ff0c42873d65276139db85dafac
 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-6.3.0.ebuild 1202 BLAKE2B 3116cf81bb808fff3153f2261d5455e1b798320222f023b70a24c7b35cc4fffdd3282de47c1d7e51373ef484c3e626c388770c311f91a3d40b8ccd6e463faa6b SHA512 9df5c78d491525b87f22fad6bbcac2ec41dcfc7396781619eedc701c3b10cf1fb8be57261d1b35d00abd247eb85a401a3683f58cd9e276792584a86e6998055c
-EBUILD elasticsearch-6.3.1.ebuild 1209 BLAKE2B 1774fc89a0b925b8ea7c9fb971cd439fffa815bdf701fb9584ef409314d0a5cd3dff09ae7730b6ccfa6f5a857f3108f7a8292d3a3b6f75f21eb1af1e74abdf69 SHA512 977c26438353872f490b0ca44c2387e5f3b0a09ada828b70d4779ec648543e8fcaf8465b9f205aca10af22560321efc801317f42a2460b1494cac68017d42299
 EBUILD elasticsearch-6.8.0.ebuild 1209 BLAKE2B 1774fc89a0b925b8ea7c9fb971cd439fffa815bdf701fb9584ef409314d0a5cd3dff09ae7730b6ccfa6f5a857f3108f7a8292d3a3b6f75f21eb1af1e74abdf69 SHA512 977c26438353872f490b0ca44c2387e5f3b0a09ada828b70d4779ec648543e8fcaf8465b9f205aca10af22560321efc801317f42a2460b1494cac68017d42299
 EBUILD elasticsearch-6.8.1.ebuild 1199 BLAKE2B db6f862c79624d37bcd5e1287aa55b5c631c102619722073200790f72aa9a7688f24786fcd191286f0976b6e6c5a7979ba7f2c236e5347c09e1ae26ffe3f9efd SHA512 c1eb39f656292888e241e9b4abf406edc88f5d4a3a9ea24ea180c5b11f3bc97bc8689482bb39ea5f0695f3301073817ebb9fc84f27b0feb428353e409b58879d
 MISC metadata.xml 216 BLAKE2B 8493bd6b16f9f2e33b12278ca7e8e9d31ea3e37a3f44876ac1dce534a2a57429dc689cf94d836e3aacd95cc119886ae88cbd2e1bf42e3d5b6523c4bed02beaac SHA512 a36b2fe6a545d22835082cab8d9f5138be3ba418c74cb5939216cd809466fcc002e30f2a9abaac8ec0990a1246332fae70a75eb7093371e222a79d405a07da6c
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.3.0.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.3.0.ebuild
deleted file mode 100644
index de833082bf42..000000000000
--- a/dev-ruby/elasticsearch/elasticsearch-6.3.0.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"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem eapi7-ver
-
-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/elasticsearch/elasticsearch-6.3.1.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.3.1.ebuild
deleted file mode 100644
index a56db80f2fb5..000000000000
--- a/dev-ruby/elasticsearch/elasticsearch-6.3.1.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"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem eapi7-ver
-
-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/erubis/Manifest b/dev-ruby/erubis/Manifest
index 302972a27d46..92ba6a09b081 100644
--- a/dev-ruby/erubis/Manifest
+++ b/dev-ruby/erubis/Manifest
@@ -1,3 +1,3 @@
 DIST erubis-2.7.0.gem 173056 BLAKE2B b1059469b5d75dd71be32eabfae0f1715dca11b9c5eb79499a5a8835a4db44e8c2163386af1e4ef9cab8cecf4ae6f2eb57b5105d53d56e5784b06d65398b22fb SHA512 49b08b28656acaf3b0c88fe064bb0d5f79fd08b834d7eba9294217b0893c5a0244ac5dd54de0e52dd17e828a0110e54b29e8c2d75171d527da957917344a0f27
-EBUILD erubis-2.7.0-r2.ebuild 1098 BLAKE2B 78c44433a0531551814ff230e2363cd85b332a75b0777c2d8bec243e8c8e231892f97842c7c5059459c3ce52a87bf8bea3eaf72f2758290dce618d4d33f40290 SHA512 ddad36fa82619f687917fc54c17da83a8225d899f6aba10eefc0056182970d9b3e839fb5c560a4c46fd807dad19b53775f711f1e2dd53c9d36dbe864a801b714
+EBUILD erubis-2.7.0-r2.ebuild 1105 BLAKE2B a2242e9a99ff3ff51f6ae32b19c06d414979c6be1a7ab35c6528cbe030a5257d3be1f5968a83efada82171a249f334fa1d1e3269843c611e0ce94c9f33aa86db SHA512 a758299523e3123489cfdb598847d46a8ca19822b2f03f112fdc440cf04281c43a4b31e2f8d7ee500d7de69f1388ed1eff5bac489b7f6030ee821b08fedd340f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
index 3969806ef269..b339ec8c1de9 100644
--- a/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
+++ b/dev-ruby/erubis/erubis-2.7.0-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.kuwata-lab.com/erubis/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
diff --git a/dev-ruby/ethon/Manifest b/dev-ruby/ethon/Manifest
index a383b3eb9f5e..c21fcbeffedd 100644
--- a/dev-ruby/ethon/Manifest
+++ b/dev-ruby/ethon/Manifest
@@ -1,3 +1,3 @@
 DIST ethon-0.12.0.gem 56832 BLAKE2B 04765dcb9599e7435c3f71b1e8c35b815123ec460dbb761360146b24acaff1aeb52a75efe5dbbacdbd11e7247743988629ce965604cdfd15cdd75ef03301d9da SHA512 5fea666efdd5e2d568d0e074f205525656e202ecea3bb5ff8a8ab838a596cab349b869baffb7926227d6cfdae5b9c1cb86bb201b4c9585056c6671ab4feee596
-EBUILD ethon-0.12.0.ebuild 705 BLAKE2B dcabd3f6d9d96cd085807da082c82a129c3712225fc05b804e3a437c9251944910a68f6185602d53dab13ca2d49bf9bdf5bc7fd216648bf7820aac195655b272 SHA512 03e52506b47080eb0442cfecf498e6ebd5552f1867c1a66c0e9d60f011214bb7cc3c917033cda66327c8444cd5dabf9bf35ccdb1fba7f4fa17d47cc547f9d474
+EBUILD ethon-0.12.0.ebuild 705 BLAKE2B de56852055168ee60793ab88416671ca6072c3db6238f90c99a34c08c482804e765c9115b1fd4799728a21864d175b9e0cf1e27f3af1a392eb8ceb773cb9705b SHA512 5a03e685e3eecc998ecf20acb3c3032950e83b854b9eb7e98e4a4d3c144d44911c156c87f8c4a7c36af782cfca4c86ea23a50fef810978aeacf14e7361675403
 MISC metadata.xml 340 BLAKE2B e49ffc5833004b5841c276ab1d712c48f8682d73aaa58e0910aead01698be2aaab88f4cde7ebc0d49ed34d177a3477ecbe99928c1924ddce664e2d4523b06210 SHA512 d6fddbbfe4745ef287bfb946576e68e72f135dd9664ad8add271f0d1724b0da518472a7bb26caeff0d62b5a720a2bff223a33b7488c15f5d09668b66ca40cbe5
diff --git a/dev-ruby/ethon/ethon-0.12.0.ebuild b/dev-ruby/ethon/ethon-0.12.0.ebuild
index 15724884f34a..390efe9b19e1 100644
--- a/dev-ruby/ethon/ethon-0.12.0.ebuild
+++ b/dev-ruby/ethon/ethon-0.12.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=6
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index d74251e270e8..b5028d0cfe74 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,7 +1,9 @@
 AUX facter-3.14.6-explicit-rspec-2.patch 480 BLAKE2B 60ebc035ea3e37628879628de36cd4c4ac9672e3fc00fec671f61b5c8cf646ccd95b1686f791032e66b7567f0f7f96cd4c9be7441f39e4e8f25346c8a4fa609c SHA512 a33322a1e2906c3ac400b798855158450a0465ed809d34bf033a868864c9e7aab0284c98c3eb85b27c8248ba6b3efb8f6cdb45219adac290151232bf87322153
 AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea8bc3346ea95df5d6b3d925a6373153460699e9075017fb43640b714f025c5f8a2167e0742bfffc20dcf886b5e0f6bdabab181a07a7fb SHA512 72192b75ae6d084d0e47ec6a7f4d0817dafd0623269d16cebcb5615d8df0efc891176d0cf246f41dd0f2180d54b8cc94ee596295787fbdb3ca83d0cd41380e89
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
+DIST facter-3.14.10.tar.gz 406470 BLAKE2B ffd97f450676ad7465332f5159dc4fc9c695b9cbaaf8a09a2b575221bf11b11c044edeaab093f5222d64b0e7ef271d860072ab5435845ddff427714a4f2950e6 SHA512 e9f6b5a722982ad80282c355a82a5a6d302e6db36367d65701b7216f80032225da58106ccb025b742d2dc6ef98e2f5df5a07e53489802ee44603bc99ab930ffa
 DIST facter-3.14.9.tar.gz 404448 BLAKE2B f95c0acce84013d58565193a35931d7f562639f607f3fed36ede5d2197336bec0ea4318a28ef29297150ab07a1fd35c292ca15c056b0b8cfe879bbebc64bfb18 SHA512 ff809c87641d65c43a9764d0a2cfe42f64c17d50e473a6d27b6ff25adfbd7be15edf25286932aeba348b669b05a11780257d41aa541fbb013c1169b6d8d25582
+EBUILD facter-3.14.10.ebuild 2140 BLAKE2B 8dd545970a36c3a3ba5428e31b3de1cb1d273289b09d070c0eba8875c94cfd8bbf234e0838c301649cefdd82716b32ee1a3d2a43cfc064f273b4089dea48722a SHA512 3c44628aafe630474d98c64133e570bd6d2733f878c1da383232d047c87d611f9722c4f6e679808faa34d9bc416c1ebb5e773cde75d1d25ac378ce4cb0dc7fd5
 EBUILD facter-3.14.9.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
 EBUILD facter-9999.ebuild 2490 BLAKE2B 9c480e951320b78a43aac1c436d5008d3461de4a62f73f76e7ae6a1eb62d5ac0b4af8f58b2fe25738c892e68d3c014be43f0ac79a8ccfc065c0f1485dbc03428 SHA512 41a5ca3bbbbfb9e5c94271490e7d9a9a1a99ca76b9c3c3ccf5b9ac6b3da005101063ad9b6e3ae8c53e9335c1d55e8b3f8f528f1b759b85a40f6251217b8a7e76
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.10.ebuild b/dev-ruby/facter/facter-3.14.10.ebuild
new file mode 100644
index 000000000000..b7819b83844f
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.10.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="
+	>=dev-cpp/cpp-hocon-0.2.1:=
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	dev-libs/boost:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+DEPEND="${RDEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
+	# be explicit about the version of rspec we test with
+	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
+)
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/fast-stemmer/Manifest b/dev-ruby/fast-stemmer/Manifest
index e288513ec34a..de6a5917cff0 100644
--- a/dev-ruby/fast-stemmer/Manifest
+++ b/dev-ruby/fast-stemmer/Manifest
@@ -1,3 +1,3 @@
 DIST fast-stemmer-1.0.2.gem 11776 BLAKE2B 090f7a9bd63fbef2c9ef84a7089c7a4881f69f9d77fb8f90377424f1417e97a636d956c4ed646b1f45c25abc1ac16a7836ca70ec1591659e77242f11b6368e60 SHA512 7a7a17c62ecc9ce6eaaed9d0783f161c53c5c6faa07b7b0577da5a46d4539bf3880f71e4e9097a489c045222738d0441c322fb5cef5e02a1483405f815a81b29
-EBUILD fast-stemmer-1.0.2-r2.ebuild 696 BLAKE2B f01db10db8ec206b19bfd3b31f4c1aee1be1989508124a0bcaf151553f7c5b0ad8dac3a932045c7aa3cc735a3a43d575bb35c58971ca93ad4c35bbbbd526c469 SHA512 36bda2080b87bfd0ec37bc30b7eb223fcd612081101e76f14e387774b27729157f536ed67df5307c78ee5be1a9a67809ff238e8e6570df906d401563d6475132
+EBUILD fast-stemmer-1.0.2-r2.ebuild 696 BLAKE2B f8b65f859a45768e9c02cf25155df830c61e9f26d1ace52fc753dc756aaba46d793726afaa027c8445988bf49573d347c0de1635e9d0a24702ba936d923fa23b SHA512 b761ee40a3672f7cf81722a0fbd268de58b50f6162674bdfe001e694763c9fe4f0808039a3142ad67dda585b73b54494328e6bcdf5f0181bd96e8617caa2404a
 MISC metadata.xml 347 BLAKE2B c8b2b78f8daa0e489cb2c2e644c2bdc7056ba7b3719f270307b0df16a6aa684c99d15d48c1a9eeb1edb30c51d446db0afcfd0f7cf8ea1617e21b7b1c1ac66b31 SHA512 a2863465c22556e4b96e34ce8f1db86e25ee2049a24feda43ee5925406ef1f356c071faf99b71a83be56084587db9a0ba8eaf49d23652f5fcd16b5c22fe77439
diff --git a/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r2.ebuild b/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r2.ebuild
index a07ca10e2233..f99a6bdd08c0 100644
--- a/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r2.ebuild
+++ b/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r2.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_TASK_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README"
diff --git a/dev-ruby/fcgi/Manifest b/dev-ruby/fcgi/Manifest
index a421538ebee3..335bcd7504ce 100644
--- a/dev-ruby/fcgi/Manifest
+++ b/dev-ruby/fcgi/Manifest
@@ -1,3 +1,3 @@
 DIST fcgi-0.9.2.1.gem 15872 BLAKE2B 1f3a9cfa79f06a655bbe3ecd36be8b650f7c1f856f84f82502c87c06f43ee9c91eed75e5441c65a635c700b8c682745f631e3268701555268eb3a1568347573f SHA512 1ffdd429ce4f2bbac771b7ac2368a5194015a7327b8b43b803914257edc174235573df6bb41a53fb71db0bf179fc24ce2392b244b5b55563d67e045c47da8579
-EBUILD fcgi-0.9.2.1-r1.ebuild 731 BLAKE2B 0d29429e514aa7d7d6367c5ecf5bb95ee1dbb577929ac77af03c2ecc22fadd2e14e4ecc7f00b690d2be2ccbd9b201835f39bd36b993336520e9bc1db3fb45ab4 SHA512 019a487d9ce1f436ec72ec6074ae893fd13e871ceaf4404c11147ffe15c12e53f90316fa9a5a3eb98ed397768786b7ea830ae7df136136f363e749bb0ed75f6e
+EBUILD fcgi-0.9.2.1-r1.ebuild 731 BLAKE2B 32720b2117d3384d0fa20424597ea3ceb29c6058f4267dde15f781294276e63dd4c02a3da8648d798460a07195c0e9c24c20776151ead5598533cb04ba922dbb SHA512 7468a3bf663e02913ccf416aa251b65a4eb55024974ca364a333d30b6a5dc828beea42dc28a76a12a8760e4b777dddf46d01651094a1bfdb284185249ee6c778
 MISC metadata.xml 347 BLAKE2B be2e5312191991db7af9e245a07250e10b0c1920e5eb7992a138fe201ab62a5bdec42c1f740c9e1a2c4920c8e7c2311b65e24e9a2d0dbbafffb3dd54beeb3212 SHA512 121248020ecab7831fd87ef528e334ed5d02b1145abf298e83192242fc96c0de018d12f2502ed991d89c3078bfb8f983409e68ecc6122e389215566ac6964ace
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
index 3fecbaa6f8fe..78c78cb225a3 100644
--- a/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
+++ b/dev-ruby/fcgi/fcgi-0.9.2.1-r1.ebuild
@@ -2,7 +2,7 @@
 # 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_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/filigree/Manifest b/dev-ruby/filigree/Manifest
new file mode 100644
index 000000000000..01ffec86e887
--- /dev/null
+++ b/dev-ruby/filigree/Manifest
@@ -0,0 +1,3 @@
+DIST filigree-0.4.1.gem 31232 BLAKE2B edcffb0b98192205c19b401babc4320c6550d3683460827425269ea8090b7dc4164582d1e73fd251a6d4e21225fc0ffaeab1eb52e7ff571631981835aab9b8ea SHA512 068ada1cac6c79cbaed150ac6168951894b3d76fd82764afc6aa9322f406a26b59777b83e1deae9348b1c20cca56db36e6acedcc92446847746d923f21009b82
+EBUILD filigree-0.4.1.ebuild 453 BLAKE2B f8a880aa64499a5b4d26e7cc89c05659ad552b84879d5e4096ebb05af0fe4bb6cf35959cf001b70e8b625c5fd5daefad508f941c770b7393e51ceffd5a992972 SHA512 0806cde889c98cbbb7f6e46cc35a7d79a7d46c4e562004f7a7107b01e7c1b137b5ed9bd36d579426f33a69edf3c75eb83537c7b7ae882488af361a5bfd2fd5d8
+MISC metadata.xml 346 BLAKE2B c6e281231d49d58d8dcaa6e14b7dcfba4eca878b3386e7f55161708582fb28e40072e3dcd8a70d0a6372166067061a87e5741c791f56539d621a3a273e5c64f4 SHA512 cd71c54d9844b523a779389dc61d2f1784e5d95146d5a5eb1e5fa7bd5376005e8b6b08a5ea57207d88a3559410a608f9a0af315948496191acd264d3d479976f
diff --git a/dev-ruby/filigree/filigree-0.4.1.ebuild b/dev-ruby/filigree/filigree-0.4.1.ebuild
new file mode 100644
index 000000000000..b60cc04a73d2
--- /dev/null
+++ b/dev-ruby/filigree/filigree-0.4.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_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="New classes and extensions to core library classes."
+HOMEPAGE="https://github.com/chriswailes/filigree"
+LICENSE="UoI-NCSA"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test test/ts_filigree.rb || die
+}
diff --git a/dev-ruby/bones/metadata.xml b/dev-ruby/filigree/metadata.xml
index f3c0d7d82ca4..3e4006e2373c 100644
--- a/dev-ruby/bones/metadata.xml
+++ b/dev-ruby/filigree/metadata.xml
@@ -6,6 +6,6 @@
     <name>Gentoo Ruby Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">TwP/bones</remote-id>
+    <remote-id type="github">chriswailes/filigree</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/fuubar/Manifest b/dev-ruby/fuubar/Manifest
index e7e74ca211af..af042535497a 100644
--- a/dev-ruby/fuubar/Manifest
+++ b/dev-ruby/fuubar/Manifest
@@ -5,6 +5,6 @@ DIST fuubar-2.5.0.tar.gz 32763 BLAKE2B 841f85cc867a8215e00f720f2ffc25aaa5444ee65
 EBUILD fuubar-2.3.2.ebuild 839 BLAKE2B 630b52584265f4ae0fe89b3c49cbf9933e66d79581f1093b56b1dc7cd96c5bf5b808665c10f0ab3041798e416597c30e71883b26e803c1eeb1dc857c9ba24c39 SHA512 a555e789b5a58d6eff31504aed762ba169e7f37497f8df6f082434d1a3c8b7c3d9ce77197dd35fa94105c989933053ad45ab81f9bbb7c8337394b9c1a9c5f479
 EBUILD fuubar-2.4.0.ebuild 834 BLAKE2B bc00f2f0592e70636af8850a7a08cee4e4c2bf6ceebca4740886b4981915d5517e52a281f8c40c6a8ad74a37469171eeaad464fc55646c61ef46c1faa300f879 SHA512 d3ee61b9283186435224263d29258f3fe1c4525df6c0f0b66aced7fb730c6fe2ef1822cb0e8fb8d5356bd64c2463b9afe2c6aad1dee1b93c571222fec34ad82c
 EBUILD fuubar-2.4.1.ebuild 834 BLAKE2B bc00f2f0592e70636af8850a7a08cee4e4c2bf6ceebca4740886b4981915d5517e52a281f8c40c6a8ad74a37469171eeaad464fc55646c61ef46c1faa300f879 SHA512 d3ee61b9283186435224263d29258f3fe1c4525df6c0f0b66aced7fb730c6fe2ef1822cb0e8fb8d5356bd64c2463b9afe2c6aad1dee1b93c571222fec34ad82c
-EBUILD fuubar-2.5.0-r1.ebuild 843 BLAKE2B 670d8f96c3e5b56c55d0ea824a58328fcf333c8e0c4c002993f98fb4fedcb4c35e20c3daea548f2c14fdd68925a7ef204840687d09acb7fc05ebb63b0d4c566c SHA512 182eb7ecc37aa5417201603e226de24161bd5d1bec10cf24e4dc3d7e7cc7a4a5bc3fff91e30cc6d4191e092a45155b1d9bd71d7a15687ea95a6ae866f002b99e
+EBUILD fuubar-2.5.0-r1.ebuild 842 BLAKE2B 3f0ceced8f5e8282c300927e37d9058c4ac807c95fd8d47ad792e58c3e5a7fe778cbb85b3de8abc2d35f364dce5c6d669232b99baf9d5abb258dae93d2a53050 SHA512 6d1e4ba27a67aa7028a5bb1828d65406ce61bc3de4a934bc4d90444deca1638a0fe16664f24790db1eb04aa1d1a25dd590a622590f90489e25c7ebb92d7b616c
 EBUILD fuubar-2.5.0.ebuild 848 BLAKE2B c18b4f0c3a5164bc0d3e5942b6b9b3ba06a7747ca3b543d003357308e1647f5d4119a7f6646b866e73e28cbce7ca251f2989559df8466b068bdaaa52a7f1534f SHA512 132cf88e8d016c6ea7ec9a64f2a15d3077520eb920a7fe61ddbd56158e067534ab4877a3727c431212f9ab460799688cd886f5cbb8b96aecef04a5eaa43cd5b9
 MISC metadata.xml 349 BLAKE2B a394e14e59c6aff0211e2b84c89f5d12b862cf44d604c6dec72d80ac8b52c6ad2333069fb04fd257d0d761283bd4aa041ff716f34576f46e455d075ce2ea2fab SHA512 0c974aa96afd7eab91e27ea72859e709fd5d8691055a06b57e2267e2ee36904b3f4b92b1b0d24659015f303017298cbb4373f225471a6350551d3d85574930f7
diff --git a/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild b/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
index 25906fa7fe0d..1e4900265628 100644
--- a/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
+++ b/dev-ruby/fuubar/fuubar-2.5.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/thekompanee/fuubar/archive/releases/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="${PN}-releases-v${PV}"
diff --git a/dev-ruby/github_api/Manifest b/dev-ruby/github_api/Manifest
deleted file mode 100644
index b7f8c5232bf2..000000000000
--- a/dev-ruby/github_api/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST github_api-0.18.2.tar.gz 2124932 BLAKE2B 62ce868b5437262c3cbcac7cf8e3966288cdf5b78e4698f3d3e35d1da3e839f6445e582db74db47292749014a9532a0ad3077a7b5bd30e2148546348241e52a0 SHA512 ebc57fb86bf56b5af6f6ed96c3dab9190dc7695f37826851d35a7621f8f655c3aae5ef613e48fd6bc98e74e8cb6218a3cf425173feb98e6e054d7fced115ac14
-EBUILD github_api-0.18.2.ebuild 855 BLAKE2B cc2899d400b9b801643940e27f9d1284d6a4c6d2b0bd72ee0b96bbda53cffab3a294b53ea9da406cc4b2c0f756e117c4683970a2f6a772809bd515afe04c392e SHA512 37b2ac5f8aeeea22607053247cbf379b8e590b59fc7156bb763b900485358c9f1bc3af768355a150d317273570f2deac3623ac5b7bf3436e3bb6573560b81a75
-MISC metadata.xml 345 BLAKE2B 1ae3691e311b91be47dcaf3c085fc67853e1a70564fbbb8a99d53046e0e33f23cca172222528a87c46d82393c6854787790eb33b22dec23cc9d71917166c8dba SHA512 13a9b76087f805e0ef3cb5a1a115dc72d681d15899f0fec4e003583f29811e3b7cd690c4e6fa8f138c4d992c39551a6b40e71a25484017e0d647ebcc9c0602e6
diff --git a/dev-ruby/github_api/github_api-0.18.2.ebuild b/dev-ruby/github_api/github_api-0.18.2.ebuild
deleted file mode 100644
index 1e652a640a12..000000000000
--- a/dev-ruby/github_api/github_api-0.18.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby wrapper for the GitHub REST API v3"
-HOMEPAGE="https://github.com/peter-murach/github"
-SRC_URI="https://github.com/peter-murach/github/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="github-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.4 =dev-ruby/addressable-2*
-	>=dev-ruby/descendants_tracker-0.0.4 =dev-ruby/descendants_tracker-0.0*
-	>=dev-ruby/faraday-0.8:0
-	>=dev-ruby/hashie-3.5:3
-	=dev-ruby/oauth2-1*"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.14 dev-ruby/webmock:2 dev-ruby/vcr:3 )"
diff --git a/dev-ruby/github_api/metadata.xml b/dev-ruby/github_api/metadata.xml
deleted file mode 100644
index 3bbebd84add3..000000000000
--- a/dev-ruby/github_api/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">peter-murach/github</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index 906adbc3532b..14f17746d3c1 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 707 BLAKE2B ae430b7934a3e32e16b54938d629f4aa56c775e298ae89e3cfe5f116e69f3869f470e3eea6961705fcc13c9ba31fc3545c3ca1e21e25ad40438eaa20313b82fe SHA512 6ebf19f214d806159621d1d20cb1e67c9bdc9f35fe51509fa43348f394ba34cbf49b628a88278b872abce1dfc1075dce58fd6f0fdea9f3905e6378c3c16f9f04
+EBUILD globalid-0.4.2.ebuild 767 BLAKE2B 80997852c908451f89d018743e88d4c424f45dca4c9af86325e839470f059ab4a29a6765e1edc28a735b0ba8fcac14a699492f6a83a4a9ce87e0a0276799a730 SHA512 bd9729f118268ca79eeee081c9bc53192c86f9f71cf19cabf60b51d39e6a121fb1507fd51f2f131fc2fedf50c5c6c59f5ab553d088ee8f8fd5bbc0263028b396
 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 9d61ff1f8a14..1d8455b2ab54 100644
--- a/dev-ruby/globalid/globalid-0.4.2.ebuild
+++ b/dev-ruby/globalid/globalid-0.4.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
@@ -23,4 +23,6 @@ ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
 
 all_ruby_prepare() {
 	rm -f Gemfile.lock || die
+
+	sed -i -e '2irequire "forwardable"' test/helper.rb || die
 }
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 25cf21070330..0fa5235fd32d 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,7 +1,5 @@
 DIST hiera-3.4.3.gem 40960 BLAKE2B a4747c6096065c1272bd3099893d27c53b5e869be16643fbd59fa0eead692e3bd082fcbf82463614336d00c3068244bd632fd6c3a87ba520566a8643f674bfc4 SHA512 126e626b9c9020f2b8565aaff35f30b35c73785120425d186c97186c5bdfafc4831216250f78fd33ffd5e1dde49646b262887747c0d73442a252c391329959e2
-DIST hiera-3.5.0.gem 40960 BLAKE2B c41d6a5cb95278e212234d6c144c5b97535c319c78874e13921e25f2f58cd9ea19884ed627bf4a715810589f9b70023b0c4bb2f6f1f8d51924ad9dac065bdaf7 SHA512 b9cdff688829fd8f124011abb4a43640a7531567a678c116e40259e1d110fd20dc7d2ac1711264f4ea61f2728f93027d65df25d5d4d8c339e465010ba2a269bf
 DIST hiera-3.6.0.gem 40960 BLAKE2B 1e49499ac5841d5fae884ffaf7ba7c72c55e3c04ee3023b2bee3e68e29d4827825e23ed4bb4a929d6337a1ff1d19dd1fbcad329495604c3171c3ab900e21b607 SHA512 6d76845e23732875c461d5b2df8599953f067ec84ea6648044e91822fea762118a108136e43ea9b7112511939978052f846d94e895b2b8f669df607fc90afbd0
 EBUILD hiera-3.4.3.ebuild 543 BLAKE2B 121f9fd758d74c0dfea47e5154778da04e759237fc8574e91429a16212f098a5f56d0798ab385f47d5c1ce96548fc28d5fb59610ff0043ec314700759e49fb3f SHA512 96805f69a7bfcc72e4b05e01d3a3eb835349dbe3fcdef6cdd06e1f9c1b2ae0c08b3c9119c93af8691b736b44e6e13a6d5c064d6099e7b3b5ec6afc886f07351d
-EBUILD hiera-3.5.0.ebuild 544 BLAKE2B 868b1b8736fac85b9465f8e9349be390765e82e9ccf37b7b787f55a2cf0b0e936c8792afe769edb23eb84ad5b4d50ef5721c76d7633e1d3e247005167ad3366f SHA512 3f3a755f864165ccd62dd98ccef9f9abbe285578c320f22b4d9b0dc41618ce5ae51d9d08b4f58c6b101960ae1850f11db5971c0f46b9fcb23a728defce350cbc
 EBUILD hiera-3.6.0.ebuild 519 BLAKE2B e043c0f5ac57894374aeee874153397204cb5db02a9e9de16b2716222fd7604b693f584563ed00d54d66245b98ab22e5877be9323a5ec9c2c6f862b290b55bea SHA512 6e1cdf3c09872a7a2009cd7eaa658559428ec6980802fb57851c4206cb13f8f86598ee59773b2ea4d81a15f75fad2f5c5ba21218ae8a24ff5568432e6886d9ec
 MISC metadata.xml 441 BLAKE2B 45d0b18035001279a7fc0b362aa00ab9bea5282f35a2237bb72e84893d8a9ff4b575e43928d48aa9906def18e3fe1bdfb121e5411c46af7117b529f136224796 SHA512 795fc49e90529600ad3a950440f33c9dc60aee0f6ad134b682d8c8e80452f015fd2de5af77ed6ad58830e61b1ab7944dcb81629d75d4b09927e218f33aa948ae
diff --git a/dev-ruby/hiera/hiera-3.5.0.ebuild b/dev-ruby/hiera/hiera-3.5.0.ebuild
deleted file mode 100644
index c91179dd0a9d..000000000000
--- a/dev-ruby/hiera/hiera-3.5.0.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="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="https://docs.puppet.com/hiera/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index ca451a0f73e1..23ddd7ae5035 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,11 +1,5 @@
 DIST hoe-3.16.0.gem 188416 BLAKE2B 48383c46512a359a269ca3475ec701b1443e0ef71b31d1ca1604de391ed4df6b0ad27dd1c5f6ed04751047d211f2c6299245361cf131e2418f224324ac9934c3 SHA512 66cefb5a24906e19bbf0c82c8539d6d101b84d0dc1d3ce1910e4117357639489968271e76e86bd3c432b9ef7e3b24a78294c06210cbef280860f7dac18100606
-DIST hoe-3.18.1.gem 190976 BLAKE2B 1b99125fddc42253918d2b9412401c0ed54a12006347b400050ecda17a1ce4491bf0419bc6ea28b68d5e1d77990973171c822862d93ee2cdc00a078f4e137587 SHA512 c281cdb2e89272ea84e54cd36d0cdec77cf6dd51f745c0aa99593586781e5182129f967086f008c33b38d25d7a3aacd2fa1899752e63f725d5ecf5fd5c04682c
-DIST hoe-3.19.0.gem 191488 BLAKE2B 186b2ad78f4f7181fa1120a2e1736ee630e16c73c2c748333ce5aab745bec433b1b11019e0a96fbef65c1d5f7039925e9fa161fd54a83ebbaee8e25299be3565 SHA512 1bdc77f78f0b1a7e0832107d40679928d8f0edc0a1deeb0e63c7f8e2f7601b5cbe0bc6c19e6f8b2f26459710a31538f8efc433ef5e930058d852e945c0b280b0
-DIST hoe-3.20.0.gem 192000 BLAKE2B 1eab1396c2dce2001b104e0587a0616913b0d0babb3d5e3d28214d04a57f70b056ba2c50843326676eec9723f9bd82625bcdf7af00eb8f3d5ef3dedc150eef9c SHA512 38f000ab396453866eb87b31a90a8714ec5bd0d8615deee9e4ab8d4fae728ffdd38f836f6cd78f63e60998705d7f2e579e2d2bd3d8ca11421785868370e20e20
 DIST hoe-3.21.0.gem 193024 BLAKE2B 2ff65edc6e0aebc93ebc8f3e628261ac3fabec4034b8e7b1bb3c38ab45c8b4641267a8c46c851ad69425c08782553c628574ae0a1417257cf64ba05a86de08f3 SHA512 39da93520bdb4efcbc58af58562ff8abbdecf45f92071ddb31f68ac799eb6f704431cea3d699aa039ba3a5217dc9b0f2d87f8b553d62860c34cb63803b625754
 EBUILD hoe-3.16.0.ebuild 1486 BLAKE2B ef4749acf7b18cd10b8fdb37596f6f77cbfec6e4ec9d68780c4464391fda1f189330f0523bb1f26d3d1f3477bc80f6c67d5d2f44311f42c0d1cae2381df15985 SHA512 b306fc188c6fd21bd4860309a944d73a84d9db49c2fda484b8f895435dabad91ccbec593389e52ff815c36d805cbc48b97fdef6f0bf98cdd0eaa6153c33eed1a
-EBUILD hoe-3.18.1.ebuild 1315 BLAKE2B a1565c0ac3d673575e26f7a50ffe55155c3fd1e9fbf012f62d9ce723fa1e0db473219290ae9ca017c82af2b57eedcaca19950eb8bb37c75f1216b34635de3c16 SHA512 aa8b4d3496ec952a945e8a490e809bbea38a5362ff938fce4ae8b14e2fa281aaebe57c6db151e97f4e11d76f66725452d57430cb3627933ed1543685496b4c40
-EBUILD hoe-3.19.0.ebuild 1315 BLAKE2B a1565c0ac3d673575e26f7a50ffe55155c3fd1e9fbf012f62d9ce723fa1e0db473219290ae9ca017c82af2b57eedcaca19950eb8bb37c75f1216b34635de3c16 SHA512 aa8b4d3496ec952a945e8a490e809bbea38a5362ff938fce4ae8b14e2fa281aaebe57c6db151e97f4e11d76f66725452d57430cb3627933ed1543685496b4c40
-EBUILD hoe-3.20.0.ebuild 1315 BLAKE2B 042d62a91969117b1fabda67ccd29cba27476257c8fd399542e08830ea5d6d92e78d36551c3e36c32b9678eac6c50801f53fbe163faeb8e35264271d8fe032ba SHA512 b2897a1eb298c4a9e66aa7adc8f0318ce0862abac68690405e37787959dd904ae6f80d803414b89b91e39461483ef02c44fe02e356082c0bca5a58960b2bb93b
 EBUILD hoe-3.21.0.ebuild 1322 BLAKE2B 6e03fa9948ac4137b829e689e4bd3e94b19802110a000d8f79e749a3efe4f9c286ab11a840b3f714078f962ea31aa11fcc79c27ee81035ac0740f609d2685c11 SHA512 b731b4061b863be8eea2799760f38bbcaebbf53f6c2f34fec8dc00af86d53ea4418b09940b4a56a870810439668e779b8bab196d37536e4ab9571ce9a1b8913f
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/hoe/hoe-3.18.1.ebuild b/dev-ruby/hoe/hoe-3.18.1.ebuild
deleted file mode 100644
index 18a0387ce125..000000000000
--- a/dev-ruby/hoe/hoe-3.18.1.ebuild
+++ /dev/null
@@ -1,44 +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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="template"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe extends rake to provide full project automation"
-HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
-
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-13.0"
-
-all_ruby_prepare() {
-	# Skip isolation
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
-
-	# Skip test depending on specifics of gem command name
-	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
-
-	# Avoid test with random sort order
-	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
-		rm -f doc/js/*.gz || die
-	fi
-}
diff --git a/dev-ruby/hoe/hoe-3.19.0.ebuild b/dev-ruby/hoe/hoe-3.19.0.ebuild
deleted file mode 100644
index 18a0387ce125..000000000000
--- a/dev-ruby/hoe/hoe-3.19.0.ebuild
+++ /dev/null
@@ -1,44 +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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="template"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe extends rake to provide full project automation"
-HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
-
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-13.0"
-
-all_ruby_prepare() {
-	# Skip isolation
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
-
-	# Skip test depending on specifics of gem command name
-	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
-
-	# Avoid test with random sort order
-	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
-		rm -f doc/js/*.gz || die
-	fi
-}
diff --git a/dev-ruby/hoe/hoe-3.20.0.ebuild b/dev-ruby/hoe/hoe-3.20.0.ebuild
deleted file mode 100644
index 849e15307661..000000000000
--- a/dev-ruby/hoe/hoe-3.20.0.ebuild
+++ /dev/null
@@ -1,44 +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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="template"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe extends rake to provide full project automation"
-HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
-
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-15.0"
-
-all_ruby_prepare() {
-	# Skip isolation
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
-
-	# Skip test depending on specifics of gem command name
-	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
-
-	# Avoid test with random sort order
-	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
-		rm -f doc/js/*.gz || die
-	fi
-}
diff --git a/dev-ruby/html2haml/Manifest b/dev-ruby/html2haml/Manifest
index 17adb510b528..f7ad16a4ea2a 100644
--- a/dev-ruby/html2haml/Manifest
+++ b/dev-ruby/html2haml/Manifest
@@ -1,3 +1,3 @@
 DIST html2haml-2.2.0.gem 21504 BLAKE2B ead2c636baacb8dbba7bd650356da5e2ebfa8ab565edb38ab03df287d8d0709b9271ef3f46fae0f2d2b86d37dbf6a0212fbf6803aaf7757a9f2653b773e46482 SHA512 b6988182073f35d4d9b9f07f2cc2ba01c66679fa646fd2d1e3c8cf0643c88b04a2b1a36d584bdcca897f804e32486a618abc8fbd8db023ff9c22ee66d93ed9f0
-EBUILD html2haml-2.2.0.ebuild 783 BLAKE2B 796b3101c7a7dec41e74196358be25038872854c94e9603afa0a7cd2d786a2749fe833ce0ae6688cd306e33ee7135463d8826d6569c3eecdc45c5478f07fc4ff SHA512 23affa393681fb0d27e133295b7e0f857a5c375b93cbe700c1ddc1f25e7e84d3f263f08cc9360e2f56abc3012a11ba2e68ac8d6afc6aa910acc1a1c927a21f40
+EBUILD html2haml-2.2.0.ebuild 753 BLAKE2B d81924347b5b250e61f51ae4e8883266cd7d48821e72d9a2909b7c79ceec353aeb82ee4c2fb8a2f7f761da483466f29204ad0a38765ce02e68c8b5e05afd2167 SHA512 efca3fe8d36660b7ff7e03b7dd004f1ec817405fb81d0f962909c12ce9c3c115676820bd53c4334cfd7b77d8fcd21fff89abb618e62f879f3ed89398d038964d
 MISC metadata.xml 330 BLAKE2B 5f142ee3520e2700e3a51713054c5be0819c6f35d211580d56c8473edcc8f16e1a145bf617bd038bf8727f942b71c3b7e79d7c5cb1ed01b75d24bda2c1866b2c SHA512 b1a1422d9a51ba4512a0ca500213b5d26f6fc3403782a6adf2efa970407273b9ee9cbdde4a44775a9c72c5581df739c8ea8b8a8c77426358b9d5f9694e22800d
diff --git a/dev-ruby/html2haml/html2haml-2.2.0.ebuild b/dev-ruby/html2haml/html2haml-2.2.0.ebuild
index 6a0a572beb5c..3dac0ad3ef2d 100644
--- a/dev-ruby/html2haml/html2haml-2.2.0.ebuild
+++ b/dev-ruby/html2haml/html2haml-2.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=6
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="README.md Changelog.markdown"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -21,7 +21,7 @@ IUSE=""
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.6.0
 	>=dev-ruby/erubis-2.7.0
 	>=dev-ruby/ruby_parser-3.5
-	|| ( dev-ruby/haml:5 dev-ruby/haml:4 )"
+	dev-ruby/haml:5"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:0 )"
 
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index 3deb7aa62493..7373301e6ace 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -1,7 +1,5 @@
-DIST http-0.9.8.gem 66560 BLAKE2B 15b6cc066d2b04c3c6df604787f69b5079dacd277dc95a74b56832fc26cd84d2b631b60a60baadaf46368e5dfda30152983c335faea636490000bc5153d11736 SHA512 bb89147a3c28ebd75d2453e51c0c422557907e055b9a20a560b803bc64edfcdfe96e997ff225a26c9ca278211b0f70faaccf2d18ce2cdc9fd95bc4048093ef68
 DIST http-3.3.0.gem 70656 BLAKE2B 5c52864168663640389a0f107e1bf8a202654a8b479c92bf5126354d360adcae45a9b4596da7cff2e412fee88ed3622870c4e2bb18eca97466b4ede28baa2a08 SHA512 fcb2549c22974712e129306b472c1a32466c50add85eee9a558582697c7ece26cb7a1db6da6aaceedb8bfd134d1213090c158db510fe53ddbe201bba6bd22c68
 DIST http-4.1.1.gem 74240 BLAKE2B 350d4a2eb966f8dae05a206e20a92d8ce0601df36673cae8c969b8849d6715c5d0ab0e24c4b6cc4f117e4788e535296f86d5193198df4a8229572817c9cd3f75 SHA512 89e088521212293db692b66a7058327c215bba119b3f01d4120fd32f0754294d4cbada88ed9cffb6f182f6d712a0923dadfc645c1618e25a802fcc3d467356de
-EBUILD http-0.9.8-r2.ebuild 1079 BLAKE2B 0a6e4c30901542b3ca659b19a7308eab8b7dc6aa63dddaa111fe922b14c0db408d1c9c4d22c821038376100b329a3ac2c298e5ed6a036481464bbd49e8d6a715 SHA512 bf9e8e66f026a7fe1a82536fd21d3607d070e58c9d657bee9a3f58ce30b0e3f0aca3ad6445eac61128deafa3eae5a1a2452646cd3d66631769dd64f336172267
 EBUILD http-3.3.0.ebuild 1232 BLAKE2B 7ee906ebf6dc79e30e857876e5c93e60954ea753a26dea28a1fb7015338a9abb67c53e4efdc8d25e4cb6249ad12d642601a626bb2a63079767e685d1c9e85db1 SHA512 e6eb39f0c79465decfc69236e45b70f853f65d95b6434fca80ea0562a0475ad1c10fa5312639b8535be59136511982799d36ae38c3881dcc52d444b0a27bccbe
 EBUILD http-4.1.1.ebuild 1343 BLAKE2B e9ac81883ea27720b8df4fec2f5bb03a11ff0bde26db8504b8241ace658248fea66f1c78eb28d2a8b0d10acb3f92774872aa786b54edfdc8ff6556ca50d6a7af SHA512 9ded2914955c8cb8b3ac9fe91e815a5721dd823f8d30b46f2a91c073a4d80b53df18f4b466f9e67b117702784318160ee38416fb471b0e6a0c380f4f237b6db0
 MISC metadata.xml 339 BLAKE2B 2508769568914caafa01e9e8e6517a7cf9c1733c772b3c605c8dbb056efb8dca3be9525e1ba2ac610bd6d5b5dc02b7625f3569dce0597444240bc2ed8d8449c2 SHA512 9b43a2f61eea32941c251429694bcfe432f284527c332efdaf4187c9ad8c6f53cd924421ca9d56cefce75cbaff104d4f7579790fe09b45a4cced06bedc44d1c1
diff --git a/dev-ruby/http/http-0.9.8-r2.ebuild b/dev-ruby/http/http-0.9.8-r2.ebuild
deleted file mode 100644
index f37b18283969..000000000000
--- a/dev-ruby/http/http-0.9.8-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy-to-use client library for making requests from Ruby"
-HOMEPAGE="https://github.com/tarcieri/http"
-
-LICENSE="MIT"
-SLOT="0.8"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3
-	>=dev-ruby/http-cookie-1.0
-	>=dev-ruby/http-form_data-1.0.1:1.0
-	>=dev-ruby/http_parser_rb-0.6.0 =dev-ruby/http_parser_rb-0.6*"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/certificate_authority dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/end/ s:^:#:' \
-		-e '1irequire "cgi"' spec/spec_helper.rb || die
-
-	# Avoid specs that require network access
-	sed -i -e '/.persistent/,/^  end/ s:^:#:' \
-		spec/lib/http_spec.rb || die
-	sed -i -e '/with non-ASCII URLs/,/^    end/ s:^:#:' \
-		spec/lib/http/client_spec.rb || die
-}
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 7a7a22828706..0ad0a9b0ec2e 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -10,7 +10,7 @@ DIST i18n-1.8.1.tar.gz 66350 BLAKE2B f5e44810f31b00c0b6dfdd8c56d76011eaaafc8504b
 DIST i18n-1.8.2.tar.gz 66623 BLAKE2B 2bc2a6174ae9b6a3342d925d29501e9cf959bf78f683a446330ab40064f39bbba5a715acf6b3baa2a1250308823880f9f91ec09aed03686f3d5bcbc314ef5807 SHA512 20cc06ab63c1e4343a49e2d979399dd599dc14e9a0faed260874d2c44419ca9b7262eb95b9949ed5cf0439b79854f5d810fe1731823b625449065666102340d3
 EBUILD i18n-0.7.0-r3.ebuild 1625 BLAKE2B 047cb266a12b698343260e0ff2d2448a95005493672a1e2bad7423c8c69b08c02b596d633864db0fe301c8afb1e82031feee602765bf1c97ee7472e60c72c0f1 SHA512 6427eac2d7f85ebd7d1060d565899a976da63229cf3567b01fdf0357e22b5cc185c6e200b0d2fe219589b031c5377706136dbec7d64c1ba8f5559014f687c91a
 EBUILD i18n-0.9.5-r1.ebuild 1465 BLAKE2B 4a0c8c91473c3ff64da3d1adabac1c6d7d07bdf1e5b4fd9ae4a38b0e69e06f6c0518ac1af41159e511d7391269665187623f08d80ded2fe541774c3c2fee2eb1 SHA512 5ec9410d7f944caae29a0ffd24da13f277a6a08a6dc2d2d8fbdb390dfd3b612bfad94fb62edae952b57348ddfff2ad2f1167aa6e6e1197f530509bfd13d975b8
-EBUILD i18n-1.0.1-r1.ebuild 1500 BLAKE2B ae1e7006df7e28a816aea7265deb8df0789832a216ef0ae9250ecad4820b77ec6d9a3685973365661373c4dd62d37a0e6a8c2e74b3c92918e97441ff60dfc0ea SHA512 3940e1b90a6f389655942b982857371bfa63d32fd8aeef999b7b83dd90e76ad65b1aee86924d678522957dfa17ebf820f71633e883171b6e2beb74c044cb2d35
+EBUILD i18n-1.0.1-r1.ebuild 1498 BLAKE2B ad1bbedbaaf1d602e237890b6e1e4d9063c558b5bb933c622be33c0d71630c7fa9d86a7ed29f51744a71d4c31cbddc2041e06cb8995200bf5009c4f99957fe4c SHA512 14da7d4f36407a2b8aa30b65cea31e1b61be35f7780bf31d40337f0f86733a3a591212cf0277e5fda8e4c26ac1bf409217acbfeeb114d6fe64c70585cd25e40f
 EBUILD i18n-1.6.0.ebuild 1545 BLAKE2B 67ef60ced1658c425b0ee9db6f80e5aef5e0ed84294b4f286235c793abd78f552276b636fb3dabc2f81142226729f8930d307b22957873e07f0c78ddd30cc8cd SHA512 de1abcc30c0ced6fd174d80ff62084b0b5e3ec943e3b92b65e6a0b932e6d86b417c507e2bc3ceea7d75ff65a1fa8792e55405883a597bc3d304f2d3376de3821
 EBUILD i18n-1.7.0.ebuild 1490 BLAKE2B 8710a7f0d15169feede283cbc30cf5f96ecf0816056be29c4e1d1bded089e66f0d5dce3cc8b6990f29f51574d73d2520a8944cd7b3af1b288d73378835a4eadb SHA512 c1b2815ca1e983d2e9d073c1e61a2c7fc36665f20eaa87217e33ff32efabda05644d697687bfe31947d61797e361417f878160a06eaea02ad9289aa6949a8770
 EBUILD i18n-1.7.1.ebuild 1524 BLAKE2B 2609711dedf31dff84450a9e28ef7e6a341b4880d96a6320245a7375d340ae33cb126f55c3b0ed9472eb279fd8c24e96774e3d7e69af9d9352559825e1994721 SHA512 0c24dcd977f4344202e53ebd991ab9de6d00247b85d8d56c2a72959bba8a22ebe3c313ed93627dabd6dd8c6de0eb078bcf02b24f71892b5664593c3e17d63d8b
diff --git a/dev-ruby/i18n/i18n-1.0.1-r1.ebuild b/dev-ruby/i18n/i18n-1.0.1-r1.ebuild
index c1a630808f44..1fd27a6dd2ae 100644
--- a/dev-ruby/i18n/i18n-1.0.1-r1.ebuild
+++ b/dev-ruby/i18n/i18n-1.0.1-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=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
diff --git a/dev-ruby/jquery-rails/Manifest b/dev-ruby/jquery-rails/Manifest
index 38907ab9b5a7..46390734163d 100644
--- a/dev-ruby/jquery-rails/Manifest
+++ b/dev-ruby/jquery-rails/Manifest
@@ -1,7 +1,5 @@
-DIST jquery-rails-3.1.4.gem 190976 BLAKE2B d0f0177bce04ca49a41c4a12e3ec35b1e4e7c6194fbda7a5e6ca48ae4a1cd1bf6845196f7b001330d54e4c19a4d3730932bb36741077980fda8de1e1a47be1ba SHA512 fbec0e09bff90d4f21a512c628767ceaf85f311ac8bd81ca58a7b41f71c0a6b25d9ab9246c4043abf71f7afaf217d51a796f2207c2321583ddd14845248c9f1a
-DIST jquery-rails-4.3.3.gem 519168 BLAKE2B cfd1c9c9a18ea919966778d4172a6733faa102086598c8871f2c9aef5460b1806f2346d1624ba7c01315dcb1090ea81771838280c0b68ae2e57a9e97ad6f24a5 SHA512 55cef78f794da90ef1f7394f919810425589d3d92dc71375c3ec2f0cd6d207e0854826887e1a69503bc6609c60c10886e0b868d2d2df46ae052c90f322aef974
 DIST jquery-rails-4.3.5.gem 523776 BLAKE2B cf5338380f1551ee5bbec61dab818f4c45eef49947647dc41cc71cc06438a3454f793122eed7934b2288a9a895578770b236fcb5f1f5a2d0c8c211708e6452e6 SHA512 78afb6ad2cfa331ffed52ef6ba67bbd6e1fd7da210223e1b0cd097b0823455036aba58a1f31b70c8a9525f1f62508ec7f688924af7b0b18f262ab8d845c9ad78
-EBUILD jquery-rails-3.1.4.ebuild 676 BLAKE2B f875a6eacabd47d7ee0516358b10e6a5fe9f1f088e49a64685e71eace5127d5861c84e59128fe683d63a6f96024a82f35905562542072e5d386a8c752158a82d SHA512 f1229e5465fed1ccd082e08084729cb3b436eb8aa465b79a74f137c2ec108bab3f4e797504f38b868143a843a83b866ca6b9259734e5c11a6d896ae25c7eb7a0
-EBUILD jquery-rails-4.3.3.ebuild 776 BLAKE2B bc0ec0184fca2d95682e62e3c22aa56c8bd0117d97c0c86cedbf197c2a30a2f2369c9736bc2288cff659ffb1bf7975da45b2e5b9df2702c4fec2f6c0bf84489a SHA512 20f6a4c1e5018e86a5bb8553d8b65a0be3161cff9624819b901b3a22618d0f01a19229617fd1a585b3654dd9dd39e5b8121dba7cf61bfe88cf75aa65f2d7c3b7
-EBUILD jquery-rails-4.3.5.ebuild 770 BLAKE2B 94e21f4a180c3575e36b642b71f4b44e5383fb558a1c2b331cf8fc16b4164fcc5b46a6b1743a8235609c59b0514a653a7d384a53b17d3242760fc8949d8e9a34 SHA512 649b82bbe3cb0410d3682cc50378589a4dd16e3035b4f0209675836d70b9c0823c2edf502fafb807cc3a215f538bfb11458449ec2e495c9675d3a7cd64f37f50
+DIST jquery-rails-4.4.0.gem 526336 BLAKE2B d6a498424fd89ed575fe778a91ba199eb81fe7c98ac042df8602d0fd680305543d8bb1c1a663d12cf696ec50e1196c59b068051c4bf34b0e3b321cc3ea898bdf SHA512 af363fe81f9689ccb7effd8a755368245b14fdbc67e14698c7dc48e69e18b731e1c65ceefedf86638d6dca6378d21c3175b02f16f6c03bd76c45494c1d0e5eab
+EBUILD jquery-rails-4.3.5.ebuild 734 BLAKE2B 258946b286cdf3bc73032eaeb6ef7218f80b161196f10c732c93c11976cda61def29905141fb49bc296b09ef2a7abb9b3eb1b7cf805ec94e77d03da8d5469e54 SHA512 e84774351c99a38c8c412d0ee9bf6e3958a803d20ed1632baf8af30a38bd06919c3ea1c4580984ced53d83d0bfd5eedc3dbdc3bd91951392d59b64d85836d2dc
+EBUILD jquery-rails-4.4.0.ebuild 738 BLAKE2B 4ae9002427b0c15ee79cb15f80bd9f9434be665b21aefb197445ceaf16f0c177f63f56c69b9ecdb3e366eda4c674733dae3d9d22bdcb5b347f5a18e8e78c1d2b SHA512 709c49b7a06e9f1ec73d82c65b03c512eb7efaa3433921f6a470a2e2ff4953e6074cc6d494bd1e6ebdc26e73b3b08a80abd7fdbac4f2c71faf05ec2d501d070b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/jquery-rails/jquery-rails-3.1.4.ebuild b/dev-ruby/jquery-rails/jquery-rails-3.1.4.ebuild
deleted file mode 100644
index a72516c0402f..000000000000
--- a/dev-ruby/jquery-rails/jquery-rails-3.1.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="jquery-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="jQuery! For Rails! So great"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/railties-3.0:* <dev-ruby/railties-5.0:* >=dev-ruby/thor-0.14"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
-}
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.3.5.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.3.5.ebuild
index 61ac064c1834..4c3f8c9954fb 100644
--- a/dev-ruby/jquery-rails/jquery-rails-4.3.5.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-4.3.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
@@ -27,7 +27,7 @@ IUSE=""
 ruby_add_rdepend "
 	>=dev-ruby/railties-4.2.0:*
 	>=dev-ruby/thor-0.14 <dev-ruby/thor-2
-	|| ( dev-ruby/rails-dom-testing:2 dev-ruby/rails-dom-testing:1 )"
+	dev-ruby/rails-dom-testing:2"
 
 all_ruby_prepare() {
 	sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
diff --git a/dev-ruby/jquery-rails/jquery-rails-4.3.3.ebuild b/dev-ruby/jquery-rails/jquery-rails-4.4.0.ebuild
index 63b557803f02..35c067115537 100644
--- a/dev-ruby/jquery-rails/jquery-rails-4.3.3.ebuild
+++ b/dev-ruby/jquery-rails/jquery-rails-4.4.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_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_GEMSPEC="jquery-rails.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="jQuery! For Rails! So great"
-HOMEPAGE="http://www.rubyonrails.org"
+HOMEPAGE="https://www.rubyonrails.org"
 
 LICENSE="MIT"
 SLOT="4"
@@ -26,8 +26,8 @@ IUSE=""
 
 ruby_add_rdepend "
 	>=dev-ruby/railties-4.2.0:*
-	>=dev-ruby/thor-0.14 <dev-ruby/thor-2
-	|| ( dev-ruby/rails-dom-testing:2 dev-ruby/rails-dom-testing:1 )"
+	>=dev-ruby/thor-0.14:* <dev-ruby/thor-2:*
+	dev-ruby/rails-dom-testing:2"
 
 all_ruby_prepare() {
 	sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index 06fb8e18c98f..af5b73e828cb 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,6 +1,8 @@
 DIST kramdown-1.17.0.gem 260608 BLAKE2B 56f0abb2c94ab2de31bcd71940c22610efc8143c434295627513735b5983a369b0d9b36a88477a4e0b14bb23a3d314280702655c854cb7134e29bebc1f276966 SHA512 0f98f4234dec41b53d7f116be1075176c7fcbf21621c6f52a9e5b4055a777b01f1a0a912be81a651e85df022e7bab3ac183ee66cd87abeae092cd1920aceff04
 DIST kramdown-2.1.0.gem 119808 BLAKE2B a5beac52349fb49d315d83391d52574013bd76e084edb25a0b3bc0d813fc5b0dae0799a03bdd20fb500560effc94ad8f262fab9bbb8eef275aaead3405d3a64c SHA512 86a2934218365c71ff4f99591cba3b49ddc5ee60a78fcd7bf1f72e86281cda7bbea3c67b1b7caca6c4b8ca6e5b62d4df25e85089db659c93bd4da4b1c8eada69
-EBUILD kramdown-1.17.0-r2.ebuild 1434 BLAKE2B 4692a13fe9149098e872a6a2acc92917d23c73fda9e5202b9224e607e65dd9ee7d7746b533a9156895bb0bb53e309a81731d9f6015372f09adf3a71f2f592496 SHA512 87956550511622ce241336c838986b00e9604ee13300c9262836828ff4a5126e8e49ef30208c74dcef937ae42dc8d9948c095929015c1d46552c7965c9371fac
-EBUILD kramdown-1.17.0.ebuild 1482 BLAKE2B ddeb6e37cd5b1794812386543ce4c05377c69cd45914f24cdeb58c368c2dd62221a289da30825e3cf61e3468d730367d3e7e0c3db0604b978f79047d8631d0a8 SHA512 42ed836f1e1a67dad91925f1c8303771b99f5d933b33b7e56cc5e422e7e27b6dcd0fa7c6b2cb68ac3b3fadc51662dd5d153c51ef81e1f7923ac8ed53fe9e2854
-EBUILD kramdown-2.1.0.ebuild 1262 BLAKE2B a56100681367080769ca5aa3c11a81ad067d1938187cbd5e9649ead5be7aa4f4ccae43fc2c02358dfec30abab6b78561613321defceb27d4ed0d53afbd658221 SHA512 1c29687d4ae5dc44d32ba6fef8fc5ad0e7a0380ccfe05a454914836f6f01730c76e06976c27577f0567084f3f119b3f10a50cb7efc46d6b661d26b1bc9a90e74
+DIST kramdown-2.2.1.gem 121344 BLAKE2B e1da7e1289b64cc3d4db253330405b03b1a430a690e2f5b32970dc8c1d52bbf1f418e8aa1c597a3333141c3974893e1532e870a131fc297b9080b66bc6918882 SHA512 7c322010a8a418706c48d5a1011354aba215d50be94354fff93a636ff3453906bb381cf5669560a6bd10ecaf3bab7b04f446efa0a4b85322865b879f74de4c43
+EBUILD kramdown-1.17.0-r2.ebuild 1436 BLAKE2B e5c2aa6525495753cfcfc051f22600197898ccd464eb4fae40afd39b64c7136563295bb2af66714e6f394ba53353f572fb8cf00234d3251a29492eefa45763d8 SHA512 4affd26db7f5d65e95f95bfc8cab205b030fbc9faaef0559c53455f52ee22a1bb273bad2d70082b02ad494e38ccaa4d9cf765187d3bd5189830f9c0adbe99ade
+EBUILD kramdown-1.17.0.ebuild 1484 BLAKE2B b194fa0ab58492b78c7fa04fecc6b16efad5ab91bdee32f8054a2dedb91dbc8adef02c4a3eca4fe9ff321483443a6d6ce519e16339e8540e410059247d4df568 SHA512 15452c76bf4c654c28dfa5c3aade706827b8d10000e733703f159fc1b8b4adcf60e4a30ed7b6a1c9299177beeba349b971a7287951d9b5946c9777b8f17ad56c
+EBUILD kramdown-2.1.0.ebuild 1264 BLAKE2B db73a628cd233a3123b8f1dcaa57de69af6f0b790127b2adc6a8d95789c023d3e97e663fa892814c58d3b83a4c032b7478e65ffbce23d681277cd0d443932de5 SHA512 c3d43f6ef8343d8a61681c3ed641264a5517ffb18c8e7b197a49e9dcf89b8586ef4aed7d5d8c70685c04e9846ff0ffffa9cb45c8d0122cacdb7d7c981295da74
+EBUILD kramdown-2.2.1.ebuild 1280 BLAKE2B f93d8af5568f81b5a219b8025ee85137b538b424c0bd94be81b6c2a28cbeebc1ba3e47d5aaffee415bd06cb36811d7bba9b29b700f5d76ba2194f4f269a8b926 SHA512 7f86497e1652f81d47deaf7059ea019640f35f4ca2b52a899b55f963930e33fdb48b9ac6f41797efdcf021015789099d9e744b035aa30610c282ad5b24e8d887
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/kramdown/kramdown-1.17.0-r2.ebuild b/dev-ruby/kramdown/kramdown-1.17.0-r2.ebuild
index d3d8e3605e00..fa09fd3b6894 100644
--- a/dev-ruby/kramdown/kramdown-1.17.0-r2.ebuild
+++ b/dev-ruby/kramdown/kramdown-1.17.0-r2.ebuild
@@ -23,7 +23,7 @@ IUSE="latex"
 
 LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
 RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
+DEPEND+=" test? ( ${LATEX_DEPS} app-text/tidy-html5 )"
 
 ruby_add_rdepend "dev-ruby/prawn:2
 	>=dev-ruby/prawn-table-0.2.2 =dev-ruby/prawn-table-0.2*
diff --git a/dev-ruby/kramdown/kramdown-1.17.0.ebuild b/dev-ruby/kramdown/kramdown-1.17.0.ebuild
index ae8762dcc1ba..ea509c6f7441 100644
--- a/dev-ruby/kramdown/kramdown-1.17.0.ebuild
+++ b/dev-ruby/kramdown/kramdown-1.17.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
@@ -21,7 +21,7 @@ IUSE="latex"
 
 LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
 RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
+DEPEND+=" test? ( ${LATEX_DEPS} app-text/tidy-html5 )"
 
 ruby_add_rdepend "dev-ruby/prawn:2
 	>=dev-ruby/prawn-table-0.2.2 =dev-ruby/prawn-table-0.2*
diff --git a/dev-ruby/kramdown/kramdown-2.1.0.ebuild b/dev-ruby/kramdown/kramdown-2.1.0.ebuild
index 68d41499af37..9c204f1bac72 100644
--- a/dev-ruby/kramdown/kramdown-2.1.0.ebuild
+++ b/dev-ruby/kramdown/kramdown-2.1.0.ebuild
@@ -21,7 +21,7 @@ IUSE="latex"
 
 LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
 RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
+DEPEND+=" test? ( ${LATEX_DEPS} app-text/tidy-html5 )"
 
 ruby_add_rdepend "
 	>=dev-ruby/rouge-1.8
diff --git a/dev-ruby/kramdown/kramdown-2.2.1.ebuild b/dev-ruby/kramdown/kramdown-2.2.1.ebuild
new file mode 100644
index 000000000000..9deca750988b
--- /dev/null
+++ b/dev-ruby/kramdown/kramdown-2.2.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="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
+HOMEPAGE="https://kramdown.gettalong.org/"
+
+LICENSE="MIT"
+
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+IUSE="latex"
+
+LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
+RDEPEND+=" ${LATEX_DEPS}"
+DEPEND+=" test? ( ${LATEX_DEPS} app-text/tidy-html5 )"
+
+ruby_add_rdepend "
+	dev-ruby/rexml
+	>=dev-ruby/rouge-1.8
+	>=dev-ruby/stringex-1.5.1
+	!!<dev-ruby/kramdown-1.17.0-r2:0"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? ( >=dev-ruby/minitest-5.0 )"
+
+all_ruby_prepare() {
+	if ! use latex; then
+		# Remove latex tests. They will fail gracefully when latex isn't
+		# present at all, but not when components are missing (most
+		# notable ucs.sty).
+		sed -i -e '/latex -v/,/^  end/ s:^:#:' test/test_files.rb || die
+	fi
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/kramdown.1
+}
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index 8f1618c2459b..dc82e0353c3c 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,7 +1,5 @@
-DIST loofah-2.3.1.gem 68096 BLAKE2B 367cf64fe458cdfb0af3dc57012d892f830a7aa0df2d30f66cde7c2f5c31c1f29be4d1b83b85f3167bca1bc02fb750a420bce655b803ca4992ded3061c8fc82c SHA512 188e84818abc3a3eed39afd66a75e7fa3c0a29f8ec957441f43f4cbfd962c8c3ea848e83f435a3d61ffc667273b5ff006df39d718b7631a11b62ae2d3f78b6ba
 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.3.1.ebuild 976 BLAKE2B c28cbe96a1cf02ddf2e4d10a4013685a03fdf55c4d676964a402f528d97a3e0e6c5d2c5ef8ba147bd72aabeb24afba830be3686ff946283638e9497c6cbe0c1a SHA512 0e46f940a077010e35b208e5569d3e05b84b712740b7c7403aff19d188ce28ec6a4d24abe2122f06dbc391788ac61265ff7b8fcc25991410ca4568719bce2ca5
 EBUILD loofah-2.4.0.ebuild 983 BLAKE2B a49a9f19dc1807454a880247684007e31f7339747c4b783685a44944d9acd6f804a9ce84a3da46b971710896c973a454bdab4f8ddb3271ab646018022ed26309 SHA512 0a696fdd8a3f2a465d00b17aa4b6f81cc4771db0582456231ed966d2baddc6a270a77b9ddd0aaadb45160d42829b9f800b96fef2ed283aa0606771689c7d64fe
 EBUILD loofah-2.5.0.ebuild 1069 BLAKE2B c50e4112e0ae8ebdaf53432c55bd5549616bdd20eecceb80083f52f9253b74fd8894189c396d7b63ab204c0e1293318ec6d831a5dd8c7ebae6337b7b06472c00 SHA512 5ef5f191d60b8b80e9a7794c431535667c240e4af6c88091ddf6936ab7ac892ef40570602e8a9abcba796255290cec10dd065dbcb26e977d95c2753db1dbf4f3
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.3.1.ebuild b/dev-ruby/loofah/loofah-2.3.1.ebuild
deleted file mode 100644
index 13f2775a9793..000000000000
--- a/dev-ruby/loofah/loofah-2.3.1.ebuild
+++ /dev/null
@@ -1,33 +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_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
-
-all_ruby_prepare() {
-	# Avoid unneeded development dependencies
-	sed -i -e '/concourse/I s:^:#:' Rakefile || die
-
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index acfdf86685ea..92563473b42c 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1,3 +1,3 @@
 DIST mail-2.7.1-git.tar.gz 625251 BLAKE2B c1efbb259042155e983c1971fe9821eb0dd850089bd04cb0c74513f6f17dabf8ecc3155d9e5846ae657383f522872323f8fba37d51fba4318ac682d18a6d4c50 SHA512 17c601c86715135331f750048339a11a67a17f34486dbafa3ba7e9af9970d60927a2fa95c72a398418548df1fdf5addb2ed3afe9da7dff1f0bd949438726be1b
-EBUILD mail-2.7.1.ebuild 915 BLAKE2B e6d83bef427e3d69a6db72e582f4c3257f6d3bd271a1af9bcc995a956fcac5df162fc496322d96fb81740d7c6bf8f78c75e061b48253e0c06ee00bd6cde47f51 SHA512 e4e26817566db808eca087da41ea4551d79d101b1be84a4676b54e86e064e1fa157bfb3e55dc20b01a959811a97c765504d1c506d4082d8519125fa548afa771
+EBUILD mail-2.7.1.ebuild 915 BLAKE2B 3c4734dff75ebbcd84609056536a5eb1d251cbdd518376f77a19d8218b3542fab6f37fc84680f8b9c8593526eba48df302fccc86be262837eed820ef5f025197 SHA512 7b9d08e487bbbce74f31beee2a5943d3b9d8b4d7bd5545857df5163ef7a5d98ce42bc689eb8ea18d1cc2fd17fcd06e697ed8d3970fe1e9a309dc723dcf328fa1
 MISC metadata.xml 336 BLAKE2B 05720c141d8870f2d762c280717a98dd07ff1d6d3679ab777e69669542b257e1cda8dc845b780d221699b8fcece77fe75f9b5226ee8ecce772bd51af22d7dd68 SHA512 0952e9c85bcf07cc1adc299d0812259156410f487f2b10a77a29f7871128fa35595b605579f85b0868179f60b978585ed27cdc069608094f7fe186b5e15ae1b1
diff --git a/dev-ruby/mail/mail-2.7.1.ebuild b/dev-ruby/mail/mail-2.7.1.ebuild
index ff1b719bd2ef..e1fa979df837 100644
--- a/dev-ruby/mail/mail-2.7.1.ebuild
+++ b/dev-ruby/mail/mail-2.7.1.ebuild
@@ -2,7 +2,7 @@
 # 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_TEST="rspec3"
 
diff --git a/dev-ruby/maruku/Manifest b/dev-ruby/maruku/Manifest
index db76d391b174..1f0def33e5c7 100644
--- a/dev-ruby/maruku/Manifest
+++ b/dev-ruby/maruku/Manifest
@@ -1,3 +1,3 @@
 DIST maruku-0.7.3.gem 140288 BLAKE2B 31da6bf63272a2e5a77aa6f3cdc1462f0039751424bd0888d69f2f2660534cab8868238cbde37d184c2ddbe50b76dbfa5305a450fc27b9995f74284a1f962724 SHA512 efef3eea7451e32c06c0820834cb98eb5424f6837b2e66e44482679d73d958e1e2c59e790a3e5ba26e0c91ece0a5c17f91877a7797d9a15a73b5344b0d444507
-EBUILD maruku-0.7.3.ebuild 1260 BLAKE2B 0e695d9028f6e21c63dcaee82f7159112de205d8ff59789b8ef5d1d011de255b24e73d1166ee701f59c74419e66f8d93d15f0633fd21c38cb2219e1aa2f1d6e5 SHA512 a427043905e8b751c57ae40aea9532dec932a9baf3070f2f6c080e13303450dd840a8ad4141d955a06891a0868b502951a6f904ba27360c0cae55e468e289f38
+EBUILD maruku-0.7.3.ebuild 1276 BLAKE2B 25bfbdf74b64628583b8992b11c0222eb8a8153d1dddea2d8643568e3ccf7f003691b2da432abe3fd1213862349dc7b78be48863aa2a5ee28605393e69208444 SHA512 a09bd99e125600d3e4cb6787f699cfb74629de617237d24f8d12e4c42bb03ace47ad4fac335026b4cce9a7807a8ad1f94bb53fd5002213196f8727c3560d1005
 MISC metadata.xml 454 BLAKE2B 543ededb4beb16959617c700295d7c7517c3969b482ee0e0ea71cab8c412ba09480b4503024dc23d1f419c9bc621a66cc23a589d240577554a36a712f4d1892e SHA512 b58d0a08843b11dd0ce0fc68d347f16aa2e6fd6530a3f7a54ece40c6076cc64544857081d9ff889a816ac545e68973f709c168378fdd756bca286e4b874a2084
diff --git a/dev-ruby/maruku/maruku-0.7.3.ebuild b/dev-ruby/maruku/maruku-0.7.3.ebuild
index a7ec7fdc4a42..a80df7d70193 100644
--- a/dev-ruby/maruku/maruku-0.7.3.ebuild
+++ b/dev-ruby/maruku/maruku-0.7.3.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight test"
 
-ruby_add_bdepend "test? ( dev-ruby/nokogiri-diff )"
+ruby_add_bdepend "test? ( dev-ruby/nokogiri-diff dev-ruby/syntax )"
 ruby_add_rdepend "highlight? ( dev-ruby/syntax )"
 
 DEPEND+=" test? ( app-text/blahtexml )"
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index ff00c624a61b..13e94c6f7631 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -4,6 +4,6 @@ DIST maxitest-3.5.0.tar.gz 61982 BLAKE2B 2098e0b1c2f77ea535d78e5165ba9289a8470ce
 DIST maxitest-3.6.0.tar.gz 62261 BLAKE2B 4863b5892997ea7019d5dc65d1adf7febd7934e743276423b1fa8b1d81f3ec5d1deadbe57890e0af525a91ae371ab4c499be031b9a6875e5fc6f64d2e7c2cfad SHA512 41e816d21769382af598ebd64f918437a5816308fd9a9695a88ed97d05e7b41085b2a6f8343ffea50bc7016562857f09057591c2698e920a6bfbd5536edc283f
 EBUILD maxitest-3.2.0.ebuild 1298 BLAKE2B 512e4121a9237d0f68c4f824fad26447c6d839c011040b6106cbecdee2f1241a3977d02aa61ad8a9bfd65364dcf1823a23e551a0a63ddfb93e35fc3a328e662d SHA512 5c2969bac7c1530ab1b7ea030f0e14e8314dcc71be333e6279d2e315f2a4801e655546185b516f705f06a1949807f2ad9018b99bd045f972a69388b046e59c14
 EBUILD maxitest-3.4.0.ebuild 1268 BLAKE2B 3a6c2a358ede46c5604112f1d95931c9faa92ae02a2bea49af2dbdc0003531cce29cc58c32ea783d69ff49f6397bd04d530242f7d86583979a9b69afe428657a SHA512 7474d29ab68de64d2b21b62f7a053d1b34635e486210654d78b0cbf06c16fe9218a208541689c767f262c0bde19c4340fadb25b11375e4edc6a9c98541d31a08
-EBUILD maxitest-3.5.0.ebuild 1268 BLAKE2B 08697a2ec7089e778a4ed46b3bf91102f7de9cdfd3a672b5b68ef071bd5d9ac98193e5ba74b90e34cf2a2e980951351097ed9ebaf6aea16c8f4e6b26d10c78c6 SHA512 731e1cdda5280ce88f0c6d74591f5af2feca18580faa9c053a18a94c710237b493dde0e1f43f93d8f3e7f0ef686df9baaf7c305eb7da005804a21d4969776e86
-EBUILD maxitest-3.6.0.ebuild 1268 BLAKE2B 08697a2ec7089e778a4ed46b3bf91102f7de9cdfd3a672b5b68ef071bd5d9ac98193e5ba74b90e34cf2a2e980951351097ed9ebaf6aea16c8f4e6b26d10c78c6 SHA512 731e1cdda5280ce88f0c6d74591f5af2feca18580faa9c053a18a94c710237b493dde0e1f43f93d8f3e7f0ef686df9baaf7c305eb7da005804a21d4969776e86
+EBUILD maxitest-3.5.0.ebuild 1267 BLAKE2B e8704bec77e593699a98763a0772e21a55ca7e0c12289f115a9c1277b0fdfde2361531a0b577315f7dd6bd408b6e44a220028a7d17ea17241010b5abd048c225 SHA512 74c7f96975ebc36991a206866609703f0b10a6c2ca28ca878d073537365b00c60f2a91dcce8e62751d38481d200998b820a20861423495b5730fc6971492fe93
+EBUILD maxitest-3.6.0.ebuild 1443 BLAKE2B d7ab666c55a10df4917dd9699ee47e3626d89619bf0476a4521d1e5a75ad6111d1148234b7801b0e4d328c6219068af4fdf6b2dbd0f752c41d9c872b0635df3d SHA512 fa9ed193bb2e465af983be9f28a3ea93e2abcff01f3d87fc6eefd81b86a4b66a4382a7b0e013cfb69888b331269b194f4fc383d460e0f044be504784745db00a
 MISC metadata.xml 332 BLAKE2B cdef4488ce14b1d8addc2b3f23fa74aa64022d4ed2dfea7a84c85122e357806dd3a466ec2f4fb0fd486373055a78ae579c0f68c90a22b8940499e1ae29c29ded SHA512 ad86da72b8bc8895b0e09bc9e435eefec9ca1738e8b34aceaa959b2431b35c2732c704bd68a02d02c3c88912c20395f8601e2d42ec26f5d15c064893c0ceff0e
diff --git a/dev-ruby/maxitest/maxitest-3.5.0.ebuild b/dev-ruby/maxitest/maxitest-3.5.0.ebuild
index c9c506088aac..31ace0fe6630 100644
--- a/dev-ruby/maxitest/maxitest-3.5.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "<dev-ruby/minitest-5.14:5"
diff --git a/dev-ruby/maxitest/maxitest-3.6.0.ebuild b/dev-ruby/maxitest/maxitest-3.6.0.ebuild
index c9c506088aac..ec0e6b03d9ac 100644
--- a/dev-ruby/maxitest/maxitest-3.6.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-3.6.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=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
 
@@ -33,6 +33,9 @@ all_ruby_prepare() {
 		${RUBY_FAKEGEM_GEMSPEC} || die
 	sed -i -e '/byebug/ s:^:#:' Gemfile || die
 
+	sed -e '/shows short backtraces/askip "fails on ruby27"' \
+		-e '/fails when not used/askip "fails with newer maxitest by design"' \
+		-i spec/maxitest_spec.rb || die
 }
 
 each_ruby_prepare() {
diff --git a/dev-ruby/metasploit-concern/Manifest b/dev-ruby/metasploit-concern/Manifest
deleted file mode 100644
index e12c83cd9e42..000000000000
--- a/dev-ruby/metasploit-concern/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST metasploit-concern-2.0.5.gem 18944 BLAKE2B 090dccb8e43426da0f51604b3257e717989d35e1430597734743df4447735cbf1dcc2e31124ae7012d6a945828dc55f80f095cf6b89584341fc5059f1275e2b8 SHA512 1d8025dd075475fcae1c663789154f7fc8dbb334f9a069a1c1a21f4b101e9b85dc7cdfc6097bbfa9387463d3050e7a715e68a0b09ebfa66aa27ccaa74a1ffe91
-EBUILD metasploit-concern-2.0.5.ebuild 670 BLAKE2B ae25782aedd9cbac839ea0480d02ab79b64079c85c0890e8b693fb088ba07fc16c6358016da0303c5b325d74560b0174b91ba88e57831d59ce8b328664a4022c SHA512 0815255962fb0e0ff054bc83c30b0729b4ff1d4d9814790a22db81278befb176283e16d22f3d55a998b47d473c44b2881090c3fa9bf08dd61882676e64db5cd0
-MISC metadata.xml 347 BLAKE2B 40af03c4a528780d9384ff7a2624ecdf51b782f33959396e0da772f6a6d680d129a6d177d5afdcb123257b21e69e3eec0f6243fac9a0d29a4f0fb0acc2239c3a SHA512 212f4b974bf78cb2129eae840f163bcecf594f1331a2b73635999785937113ee550b8ce10d05853ba81df3d3ecf80c21a93c04b8607e2fa1820921b8be9ef679
diff --git a/dev-ruby/metasploit-concern/metadata.xml b/dev-ruby/metasploit-concern/metadata.xml
deleted file mode 100644
index 0f151a8a9f1b..000000000000
--- a/dev-ruby/metasploit-concern/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/metasploit-concern</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/metasploit-concern/metasploit-concern-2.0.5.ebuild b/dev-ruby/metasploit-concern/metasploit-concern-2.0.5.ebuild
deleted file mode 100644
index 55b15f02b578..000000000000
--- a/dev-ruby/metasploit-concern/metasploit-concern-2.0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app spec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Metasploit concern allows you to define concerns in app/concerns. "
-HOMEPAGE="https://github.com/rapid7/metasploit-concern"
-SRC_URI="https://rubygems.org/gems/${P}.gem"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-#IUSE="development test"
-RESTRICT=test
-IUSE=""
-
-RDEPEND="${RDEPEND} !dev-ruby/metasploit-concern:0"
-
-ruby_add_rdepend ">=dev-ruby/railties-4.2.6:4.2
-		>=dev-ruby/activesupport-4.2.6:4.2
-		>=dev-ruby/activemodel-2.4.6:4.2"
diff --git a/dev-ruby/metasploit-credential/Manifest b/dev-ruby/metasploit-credential/Manifest
deleted file mode 100644
index d3829300b26b..000000000000
--- a/dev-ruby/metasploit-credential/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST metasploit-credential-2.0.14.gem 110592 BLAKE2B 09f3eee0f288ab26695177b014b98dc871f6f009f34aaad4fbd7dfcda8acc63f75524fe7d181b1dccca863cc83eb50f249e0c07cbb0f07e9c79856a4389cdcd9 SHA512 66670fc89dc61d6d32577c9b46dc6ddfab15b9c0118ba15cc7398e10ec8de63cd7150fbfaddbd01a573ead6d98619dd9c19a5835be58baaa1fc4a9c777839b00
-EBUILD metasploit-credential-2.0.14.ebuild 656 BLAKE2B 74055061ef3cf7f4575000bd118fb0d9980246f2df545b4a52b27d2c587935958814230c853d2bdf36b41e46d5f4ae5c629d5bf4e2dc7b8c26b19dcd94ae26ee SHA512 8538b5f4a7081e6984fad407476946ec6f7283d06bbe3f7b656f6a53902173f4f647d584c77af59970cfc265f95fd758faa2c462088ed4bbd7901f97dc496a1b
-MISC metadata.xml 350 BLAKE2B 88bdb8a804163c8548382f47a3c406cf4ebcaf0fb7232c19f19bb471df45ce00a5d6b717dd1961d9d665c63e8214b1d92c0a1ba37de76757c835daf7e3100f6d SHA512 546980668f617c0ca68986be718208efa1df3446cf9c9ebe50bd5def95bf226f94ef6fa3e58bf5347de89a050f9973aff39669ec565c6059d31d09670cb667f5
diff --git a/dev-ruby/metasploit-credential/metadata.xml b/dev-ruby/metasploit-credential/metadata.xml
deleted file mode 100644
index 98a26fb7079d..000000000000
--- a/dev-ruby/metasploit-credential/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/metasploit-credential</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/metasploit-credential/metasploit-credential-2.0.14.ebuild b/dev-ruby/metasploit-credential/metasploit-credential-2.0.14.ebuild
deleted file mode 100644
index 5220d95e6005..000000000000
--- a/dev-ruby/metasploit-credential/metasploit-credential-2.0.14.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db spec"
-
-DESCRIPTION="Code for modeling and managing credentials in Metasploit"
-HOMEPAGE="https://github.com/rapid7/metasploit-credential"
-
-LICENSE="BSD"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-RESTRICT=test
-
-ruby_add_rdepend "dev-ruby/metasploit-concern:2.0
-	<=dev-ruby/metasploit_data_models-3.0.0:*
-	>=dev-ruby/metasploit-model-1.0.0
-	dev-ruby/rubyzip:1
-	dev-ruby/rubyntlm
-	>=dev-ruby/railties-4.2.6:4.2
-	dev-ruby/pg:*"
diff --git a/dev-ruby/metasploit-model/Manifest b/dev-ruby/metasploit-model/Manifest
deleted file mode 100644
index 6e3c1c56de2d..000000000000
--- a/dev-ruby/metasploit-model/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST metasploit-model-2.0.4.gem 81408 BLAKE2B 5a4be9e61649710470618d4334279054cbefc1027a1d4674b6be0c6a4c632219fd2dc3ac5f9f56dc9018712e5cbcbe191d5749ed2ed10cf98f884a06e41ec736 SHA512 70f6d948227bc99f877c3b5631a964087c0ebfdb091f128c72bc5da276bf57a5055aea5cdda4dc66e1fb177606afec9b7b3ee4076211f43928a2defb93294ac5
-EBUILD metasploit-model-2.0.4.ebuild 1876 BLAKE2B 39d6fc56669a08ddbefa7b449ce179d3a981ed5d0faaa489115595ff3cc4763d7b7c3ddc6c5903ef115ba5c113109d2bf37c60695f60ff899c044d19741b0942 SHA512 8551611fa7366cb685ac39048ca04e30cf8d137f99994cfc6562ed50e26f6ca97da01bf8e058fe7210034c24c0e13ece2c422c09db1ccd190451e0e64c6d5fa1
-MISC metadata.xml 541 BLAKE2B 5cbf1dc5abd33de9b63c4b70eceaa58cc2e9b4d4fbf4ebae04ee5ad769c3a419ae7c5e3f5508370f88fc2b3f44e13c5de0ba782322173142211e92a3c713f5b7 SHA512 a61494f72cb863a18cf370ebfdadcda7f4f3ed54e2c9d1e4ab9cf006f26bbefd30b1f293bd3f7df5e766994b044fe27a7b4fb4d78a1c7fdac7e2380aace901cc
diff --git a/dev-ruby/metasploit-model/metadata.xml b/dev-ruby/metasploit-model/metadata.xml
deleted file mode 100644
index 3534a5dd3a91..000000000000
--- a/dev-ruby/metasploit-model/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-<longdescription lang="en">
-Common code, such as validators and mixins, that are shared between ActiveModels in metasploit-framework and ActiveRecords in metasploit_data_models
-</longdescription>
-  <upstream>
-    <remote-id type="github">rapid7/metasploit-model</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/metasploit-model/metasploit-model-2.0.4.ebuild b/dev-ruby/metasploit-model/metasploit-model-2.0.4.ebuild
deleted file mode 100644
index 8ef919bb1032..000000000000
--- a/dev-ruby/metasploit-model/metasploit-model-2.0.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24"
-
-inherit ruby-fakegem eapi7-ver
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config script spec"
-
-DESCRIPTION="Common code, such as validators and mixins"
-HOMEPAGE="https://github.com/rapid7/metasploit-model"
-SRC_URI="https://rubygems.org/gems/${P}.gem"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~x86"
-#IUSE="development test"
-RESTRICT=test
-IUSE=""
-
-RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
-
-ruby_add_rdepend ">=dev-ruby/railties-4.2.6:4.2
-			>=dev-ruby/activesupport-4.2.6:4.2
-			>=dev-ruby/activemodel-4.2.6:4.2"
-#		development? (	dev-ruby/bundler
-#			dev-ruby/rake
-#			dev-ruby/i18n
-#			dev-ruby/multi_json
-#			dev-ruby/builder
-#			dev-ruby/erubis
-#			dev-ruby/journey
-#			dev-ruby/rack
-#			dev-ruby/rack-cache
-#			dev-ruby/rack-test
-#			dev-ruby/hike
-#			dev-ruby/tilt
-#			dev-ruby/sprockets:*
-#			dev-ruby/actionpack:4.0
-#			dev-ruby/json
-#			dev-ruby/rack-ssl:*
-#			dev-ruby/rdoc
-#			dev-ruby/thor
-#			dev-ruby/redcarpet
-#			<dev-ruby/yard-0.8.7.4 )"
-
-ruby_add_bdepend "dev-ruby/bundler"
-
-all_ruby_prepare() {
-	[ -f Gemfile.lock ] && rm Gemfile.lock
-	#For now, we don't support development or testing at all
-	#if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
-		sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
-	#fi
-	#if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	#fi
-	#if ! use test && ! use development; then
-		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
-	#fi
-}
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]
-	then
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-			BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
diff --git a/dev-ruby/metasploit-payloads/Manifest b/dev-ruby/metasploit-payloads/Manifest
deleted file mode 100644
index 533d6e68ebb5..000000000000
--- a/dev-ruby/metasploit-payloads/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST metasploit-payloads-1.3.53.gem 12161024 BLAKE2B a98c24faeba68cc00240324235bfc887c31dde4240ee37a1decd38c0738a0ffdad9dbe2b3e6026dc99c4299e38025d3aa13a39589b948950d83ac9f69b6baa49 SHA512 698f91348ebcb2e0a74b506f391fa7eded7c5974821d283ce4890a8c63472db891c8837ef2f67fbe27996e72ec09ecbb4c32721311d57ab6633e5ed2fd426769
-EBUILD metasploit-payloads-1.3.53.ebuild 1375 BLAKE2B c9dbac12d136faefd3a4515da30cea9602a23c42ad2df42058eaa72131a1126b983a7a6c00684d2080ce79afe17fa788b4c2182f5089e36bed3367feaa3bf04d SHA512 2ac7b9759168e1fb0206763214b056359b385e484db77352cb3a6ecd7e8ee0e0a94df95f8f73ed4bfb57f4fdde70d239659eeacc2a2841e437de5a7a14f06337
-MISC metadata.xml 411 BLAKE2B 1c2147ca1973736e6f07ec50fe8c6cb2d1a09139c34e7fa7cfb92b79f63df8e78998755f3ec257247fcd33ef555c70bdfbc7940baee4b6f035c65c89c6752697 SHA512 743c8818374b6225188a44bb6ef3eaf340911620ff58c338a2f361d71a98256746de45e6e141d45e43d79a3fc5967cc9565e3b415bcea63044cd6b898107093d
diff --git a/dev-ruby/metasploit-payloads/metadata.xml b/dev-ruby/metasploit-payloads/metadata.xml
deleted file mode 100644
index a08ccf4f3665..000000000000
--- a/dev-ruby/metasploit-payloads/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/metasploit-payloads</remote-id>
-    <remote-id type="rubygems">metasploit-payloads</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/metasploit-payloads/metasploit-payloads-1.3.53.ebuild b/dev-ruby/metasploit-payloads/metasploit-payloads-1.3.53.ebuild
deleted file mode 100644
index 66b34890ecde..000000000000
--- a/dev-ruby/metasploit-payloads/metasploit-payloads-1.3.53.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's Meterpreter"
-HOMEPAGE="https://rubygems.org/gems/metasploit-payloads"
-
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#no tests
-RESTRICT="test strip"
-
-QA_PREBUILT="
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/msflinker_linux_x86.bin
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_sniffer.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_networkpug.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/meterpreter/ext_server_stdapi.lso
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/armeabi/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/mips/libndkstager.so
-	usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs/x86/libndkstager.so
-	"
-
-src_install() {
-	ruby-ng_src_install
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${PN}-${SLOT}/data/android/libs"
-	EOF
-}
diff --git a/dev-ruby/metasploit_data_models/Manifest b/dev-ruby/metasploit_data_models/Manifest
deleted file mode 100644
index b48132c96e33..000000000000
--- a/dev-ruby/metasploit_data_models/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST metasploit_data_models-2.0.16.gem 182272 BLAKE2B 918c57e62552e2b3288ca24e8ff7abeb30b0b6221906890c7b2e15c674356de6861a10500735d5a912b0deefb6b378b64111bd18770c65b10dcdbc911e6439d6 SHA512 bf2c2c162d23750eceeb315b9a5ba9e8b80bf4ace9e32f8c1e97c35939338d026d640675b3e5eaf61c6897007db07e186d4d5be944dc3bca16c138f1f6ae6ada
-EBUILD metasploit_data_models-2.0.16.ebuild 1718 BLAKE2B 60e1fd14f471f1c1be828b0233926333f2858354ce55f24020dfc20f6d9faec7b04b2f2630155d510514290253b9637910399f918d9b3cc5f8e937e32e8ebdf1 SHA512 3247d78aff4af3db22445558cc25282c0aa4c57c19757f166dd3a9d80a907732ace123ba34cd6e3709e3bdb184783fba3b4ec0ecc7eee6248b6f78fa209a3321
-MISC metadata.xml 351 BLAKE2B 0155a3cb58926357628d45ce946dfeec0ca027907e1fbbb40fb046f01328efb8eafbaafa9e8f7736ea78671a5bfb1dcf3226d9d386795f3580b3286d8f7cf230 SHA512 ee266255d74e739d98e87921a9f60e21ace6b1d0b2ebe403747ed27a06cbf944a70739c0f2ab31f80a2239853ed228da1d86bb1f601648d4f8d5c233a4e62fbd
diff --git a/dev-ruby/metasploit_data_models/metadata.xml b/dev-ruby/metasploit_data_models/metadata.xml
deleted file mode 100644
index 50c640c05438..000000000000
--- a/dev-ruby/metasploit_data_models/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/metasploit_data_models</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.16.ebuild b/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.16.ebuild
deleted file mode 100644
index b08faf31eb4e..000000000000
--- a/dev-ruby/metasploit_data_models/metasploit_data_models-2.0.16.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db script spec"
-RUBY_FAKEGEM_GEMSPEC="${PN}".gemspec
-DESCRIPTION="The database layer for Metasploit"
-HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
-SRC_URI="https://rubygems.org/gems/${P}.gem"
-
-LICENSE="BSD"
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-RESTRICT=test
-#IUSE="development test"
-IUSE=""
-
-RDEPEND="${RDEPEND} !dev-ruby/metasploit_data_models:0"
-
-ruby_add_rdepend "
-		>=dev-ruby/activerecord-4.2.6:4.2[postgres]
-		>=dev-ruby/activesupport-4.2.6:4.2
-		dev-ruby/pg:*
-		dev-ruby/postgres_ext
-		>=dev-ruby/railties-4.2.6:4.2
-		>=dev-ruby/recog-2.0.0:*
-		dev-ruby/arel-helpers
-		>=dev-ruby/metasploit-concern-2.0.0
-		>=dev-ruby/metasploit-model-2.0.0
-		<dev-ruby/thor-2.0"
-
-ruby_add_bdepend "dev-ruby/bundler"
-
-all_ruby_prepare() {
-	[ -f Gemfile.lock ] && rm Gemfile.lock
-	#if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
-	#fi
-	#if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	#fi
-	#if ! use test && ! use development; then
-		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
-	#fi
-	#use the stable version of pg
-	sed -i "s/'pg', \"0.20.0\"/'pg', '0.21.0'/" metasploit_data_models.gemspec || die
-}
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]
-	then
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper mdm_console mdm_console-${SLOT}
-}
diff --git a/dev-ruby/metasploit_payloads-mettle/Manifest b/dev-ruby/metasploit_payloads-mettle/Manifest
deleted file mode 100644
index 18c8432c3014..000000000000
--- a/dev-ruby/metasploit_payloads-mettle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST metasploit_payloads-mettle-0.4.2.gem 18293760 BLAKE2B 98de479bbc72fd2ac916efaa4ac64f1aaf0d7267926ee5b56bfc2ec2b91450039c0a4d9d4322174355b4b089e5f9951145d5cbf87759e2bfe4da78e5b8cceec4 SHA512 8a0f8c1ca75d7664d33392e6c0c5a3de56ddd0a5c0f97f96091041caee89e74a2f3a42277a1f0c3eb57ca68706b344f0235b8ebc92870c6b8a89fa7bc20de5f0
-EBUILD metasploit_payloads-mettle-0.4.2.ebuild 2784 BLAKE2B fefee80a96560e42dcf2309f3869b33467a5cb87f23c0517223fa3d19d8131d809cf0c9ab0343bbdb9c849d17bf7fcf3ae5a7a32068130c4715cbf510e455316 SHA512 d6514760bd85ad5ba718b753ac5a01c3b0937fe0bbba7637bcfad04173a5e22e5590e69df242287608263fbf696c20cccb4813e76fc8b704628236cdb822291d
-MISC metadata.xml 405 BLAKE2B 90dfb31afea9cdd11f6a76d3492227e82af8ed09b2cb977c0d885a93eeb729b2601a27544459573681302221ee8d1a645037fd4de609dc95a11e3d84f32d51ad SHA512 fefa2f08d4ee78ae1d3d057588d8c015c6133c3231f0dc3ea0be3ec080114fc9227684a6e268a2ceabe88f6bc0360088b6aecff54346ac5f5f5d45e13504c2c0
diff --git a/dev-ruby/metasploit_payloads-mettle/metadata.xml b/dev-ruby/metasploit_payloads-mettle/metadata.xml
deleted file mode 100644
index af9237fca3f1..000000000000
--- a/dev-ruby/metasploit_payloads-mettle/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/mettle</remote-id>
-    <remote-id type="rubygems">metasploit_payloads-mettle</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-0.4.2.ebuild b/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-0.4.2.ebuild
deleted file mode 100644
index 9dcb6f6f00cc..000000000000
--- a/dev-ruby/metasploit_payloads-mettle/metasploit_payloads-mettle-0.4.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="build"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compiled binaries for Metasploit's next-gen Meterpreter"
-HOMEPAGE="https://rubygems.org/gems/metasploit_payloads-mettle"
-
-LICENSE="BSD"
-
-SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#no tests
-RESTRICT="test strip"
-
-QA_PREBUILT="
-	usr/lib*/ruby/gems/*/gems/${P}/build/aarch64-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/aarch64-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5b-linux-musleabi/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5b-linux-musleabi/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5l-linux-musleabi/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/armv5l-linux-musleabi/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/i486-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/i486-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips64-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mipsel-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/sniffer
-	usr/lib*/ruby/gems/*/gems/${P}/build/mips-linux-muslsf/bin/sniffer.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc64le-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc64le-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc-linux-muslsf/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/powerpc-linux-muslsf/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/s390x-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/s390x-linux-musl/bin/mettle.bin
-	usr/lib*/ruby/gems/*/gems/${P}/build/x86_64-linux-musl/bin/mettle
-	usr/lib*/ruby/gems/*/gems/${P}/build/x86_64-linux-musl/bin/mettle.bin
-	"
-
-src_install() {
-	ruby-ng_src_install
-	#tell revdep-rebuild to ignore binaries meant for the target
-	dodir /etc/revdep-rebuild
-	cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-${PN}-${SLOT} || die
-		#These dirs contain prebuilt binaries for running on the TARGET not the HOST
-		SEARCH_DIRS_MASK="/usr/lib*/ruby/gems/*/gems/${P}/build"
-	EOF
-}
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index 3f7539b3de2e..a1b0db23773b 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,7 +1,11 @@
 DIST mime-types-data-3.2019.0331.gem 158720 BLAKE2B 513716a6095208f63eb479497af4e713308a367ef24808d7dd05fae5844482d4eccae7fe32834302caf9a6161df0bbc2506e2f34395315dae98b32e96dba1af8 SHA512 e5b158a90ce78eba2e0f328bda98d3622d8114ab61bb9636069b5e89a507d39e4c41de7f6ab48a4f49e4b5976cad645928c5d1bcc79f09654dde87e5babeba03
 DIST mime-types-data-3.2019.0904.gem 160256 BLAKE2B 7329657e943de126efe83dd48f6583a55b93978837665e71bc9a138b4826933d083e365e0f5bbbd4074a323d8d69731e3e0a4b831bb67503d652b0104fa03ec6 SHA512 a91d31fbc051b6ad57d22e6c4810191f8fdc05137418f11280744cb3164b912e81073c0ee92c18e9b3fb415071ca764a541c30a0a98e1850fba87a4b5b25899e
 DIST mime-types-data-3.2019.1009.gem 160768 BLAKE2B c03348c8fb03d6398ca542679789e323cd9e11a575119d84c8310c78f05a4b71f0b26b7268b95dbaa4b5a5c19ee005c25ce0b4d31acd3a6de9c731e78c1ca0a9 SHA512 f4a18fccb5bb4cb558c273276ba83cc1189faa9ce97ea671f2168449b9b1d35fa0be26d7147c2b80ef12624b427a754b9fa78fc4684c835b4a51f7b6d888d6cf
+DIST mime-types-data-3.2020.0425.gem 163840 BLAKE2B f9139aaac4bde42391efb1d1227cb55560d7fac1240ae240074c7895b252a87e0cc2ff4e17c691089749c20957690f13f451e2d6a3bed5f7e9b34bdc33af9cee SHA512 b32aeed2cc8943db3ba3275c704279c43f31bed70631eae11c258244804b8080f0ea2da3705d7ab7e0f5934a8d1eca0c4b64e40eac520102991109106a3c507c
+DIST mime-types-data-3.2020.0512.gem 164352 BLAKE2B 6884cb029386dbcc3ee433dbe13baba99bc67f1ae409aef5f698731ce141b00c44221b667c2efd3d3b949d5ecaa0b4f0a3ad5a5fe5ddc99e309cf4a925db8e0d SHA512 019e45ed63ec86ef3eb4784a1526d4f163daaec676786b21c345bb8e1c57b26444ac7ee11fb25ffa9bbc687a60ae98d1cbc5d9ef60b446f50c5896a30299bd71
 EBUILD mime-types-data-3.2019.0331.ebuild 655 BLAKE2B 0e8b778f06109a75c8704fd923cd4fb1d2588d314cce666c5ffc8c3a1855995dfd74c5e927559e46b4add43e8a790a5acedffecd2a8b888fa2d8b29abe4bf9da SHA512 1cd8bc0f8fe76c83319f9a98afe1bc61ed8a1d0f972d2d312ff01a6372f2d6f162a9f01d4dec8627b2340ac02e0d3d6793bc82b7b520771b6a32470364ef2a66
 EBUILD mime-types-data-3.2019.0904.ebuild 617 BLAKE2B 15f60bc28f0e5f3d4400075352887f6f6e6fbe61728f02e83f28efa6b248ecd6e163b0476aba264dcb4ac956089cc080c45ea81e1d775f4170072cdeb334f37b SHA512 ef5cd98cd194fb2e5c19af2a7713944e0f6aa2549fa8a814d1367c0409317171a8e65cec121d359ec16771bee17aebf993f57dad0937831ef314ef56224396db
-EBUILD mime-types-data-3.2019.1009.ebuild 625 BLAKE2B 2be9ac0239193e88cd9cc7306ad5f0f70be6bb7d71ecd89bd6e232d388509d911e5df9b886a003313b0f82058de40a18f3191e90cf6e13de35606e2273c39387 SHA512 b115d2b3eb7c095cb7531f7fc3fafa9c3f075aabf172dbf0f7360dc8abb701467f4adb6909a7c1389606c0aae7daf0f174636c34381e371c0743e2894d1c74d7
+EBUILD mime-types-data-3.2019.1009.ebuild 624 BLAKE2B f7d784fa168b9adad93af0f040e47cddb9e146da341e944e1212353737419657c79f4e0dbfbc9bf31e8723c2f2937ebb8785d3ee69b268be3ede5f70e369cce0 SHA512 2ea61463ce0ebec58f5f32bc5b7be2ba932dea4eaa5386e03cca8d1e3a2720fad3d15106adde3aada08b02fab103553a80a6e14b38a2b755de0de70ded69bf72
+EBUILD mime-types-data-3.2020.0425.ebuild 625 BLAKE2B 29a87f9920fa8f686522552b2726e87caaf3b57429ee4d1302bea32f52d2d82603f2364dc142a86c4db4a2a05f7126aa1a07461ef453e430abc37c255fe317b9 SHA512 b86ef144d2bcb1f798f86790f6748abdd25caed0a89f8f01fba4d40011d1d527ec32e0bbb7d5e469b5286a10941d0079a34028edd4424f44c398dc2bd960d518
+EBUILD mime-types-data-3.2020.0512.ebuild 625 BLAKE2B 29a87f9920fa8f686522552b2726e87caaf3b57429ee4d1302bea32f52d2d82603f2364dc142a86c4db4a2a05f7126aa1a07461ef453e430abc37c255fe317b9 SHA512 b86ef144d2bcb1f798f86790f6748abdd25caed0a89f8f01fba4d40011d1d527ec32e0bbb7d5e469b5286a10941d0079a34028edd4424f44c398dc2bd960d518
 MISC metadata.xml 352 BLAKE2B 31923bc222e1b0230ff1b03dff06215d199c9f0de7c7def0a0acfa7e6d74088efad1934704aa817ac91a8ed7d8a6287c059ae72d925fb83b2a15226b9a2f7dd8 SHA512 b994c7733a66987a405c5e03c34cc1c5c33a102d6121843147b846b2c6c0eb5eba2e5bfb6b8bdc27c39adfdeaadb1f5a525de3667ee7b22f9362b8539f42ec44
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild
index 9bbe07e3d99b..0cf2b502e748 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2019.1009.ebuild
@@ -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
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2020.0425.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2020.0425.ebuild
new file mode 100644
index 000000000000..ba9714b220ff
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2020.0425.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_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Registry for information about MIME media type definitions"
+HOMEPAGE="https://github.com/mime-types/mime-types-data"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2020.0512.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2020.0512.ebuild
new file mode 100644
index 000000000000..ba9714b220ff
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2020.0512.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_EXTRADOC="History.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Registry for information about MIME media type definitions"
+HOMEPAGE="https://github.com/mime-types/mime-types-data"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/dev-ruby/mini_mime/Manifest b/dev-ruby/mini_mime/Manifest
index 6207e0687edd..33942b0ef818 100644
--- a/dev-ruby/mini_mime/Manifest
+++ b/dev-ruby/mini_mime/Manifest
@@ -1,5 +1,5 @@
 DIST mini_mime-1.0.1.tar.gz 31329 BLAKE2B 970927c8bb2d00f2e0b71cbca9aa954f732eb9d46d2e9b35a6b042ade88aaea993b40023a189b4ce1515b2b476d123945b4ec2d3fef05d4444f3e1a0f492df65 SHA512 2002ed95fe49bf71a95987f35e25e9086a5365e6eff9f7cf8a33a742cbbbd31e5020fbcd0d35b31e7dc61c0e82390a03e5241f4e5a88e9f7d7a2d3020c0ea9ee
 DIST mini_mime-1.0.2.tar.gz 31971 BLAKE2B b2783f9376d5299ba77d1cab0326f706cc671a96aac58e8c65879f9180cf3f1f359eba1b8ed4028c775728d4d633d6e8cce06acee90cfe9b60cde2e53f9a2360 SHA512 644eefdc9277642b8b94ce8071826ec993f7da1a5bc8903bd17ece05a374f286014d05b5765ec5a5f7f0fa9252b56d3bdd03109a3702075f6e8ccb68a4cef98d
 EBUILD mini_mime-1.0.1.ebuild 1042 BLAKE2B a8c8ed6cf1934e44184b2bd11d3a6ad2f225672a7dff71f909f31b26ff29d48d7a3c023719a5661cb62161d740d2da1fda46d35d061cf160461ddd619ee70916 SHA512 fa4ea8907fe76abd68f16d2943dc3a4acc5dd962e2814375256206db32a969018f6cc0ef7ae0b0fc21dc6a2e84421499185ca53e1887e3f12aeae3329fa5ada3
-EBUILD mini_mime-1.0.2.ebuild 1036 BLAKE2B 06cdb31f78400b2183c71cc6c9cb9062d5475d9c1061b4463da0786e812e1138886fcf847d9396d8bcd2a1c4cbb3076543904ffc43056beb4f352e20c6c67ce6 SHA512 f38ca67d62046e9dd5bce32333bfc8594ce1ea3949cf6b6d61de95c78ed3b94751eb039432fe1a37881c9aa79db030ee3918636428d12505b6869ea3fe0643c2
+EBUILD mini_mime-1.0.2.ebuild 1043 BLAKE2B c48e6c42474ae2dedd5d2b2a8ab766f728a710b86c8e79bd0189f708e1168d65106f606ed87f49ff5accf9fd5fe460bc7cf790312ac1eab4bb618eb1e24fe97d SHA512 95840fedcecc7ea40b13b775b14481cd7910b1a3c4c7335223758b480531f3eeb521e2da19de6d5334a46e304eb52c8fe9209d0252e48efbf2add9f353c7b3ad
 MISC metadata.xml 345 BLAKE2B fc6de1be1e40f5e450d784f3e2e2be6f0339687cf728fd6b63bf6f4fd1927200f3a5262a2fca9bfa5a33310cfffdab9fbb817ea40072dfcecffc963b5193107e SHA512 bbffbfd689e60f39f73d5117f6327b250a917446edc6d0dc14cb43a5fbb00dbeaf6ebd92c090f3e7b2168dfc0c409c58be287acad9243a420bd5bbde64f80c43
diff --git a/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild b/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
index 4071f6f7965c..fb60735f2c58 100644
--- a/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
+++ b/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/minitest-global_expectations/Manifest b/dev-ruby/minitest-global_expectations/Manifest
index ff9397c3c15f..1f255c502b2d 100644
--- a/dev-ruby/minitest-global_expectations/Manifest
+++ b/dev-ruby/minitest-global_expectations/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-global_expectations-1.0.1.gem 6656 BLAKE2B 19df8ad02f9dad9711e219389fa2d0114d1b2b07b3d7e263eb69e48d78596184261c5de91d3f03d996bf45e897d1a7ac6bb3efb77cede34203f6712263eb573e SHA512 e63b50b02612d751b1bd0b3c9e100e0f6b674dfa5475434a213f78c5e556004c43f00b9bf5b9c479c2381be87015125a334308fae27d70a6aed1e9b392ece546
-EBUILD minitest-global_expectations-1.0.1.ebuild 404 BLAKE2B 8733e24add490e4713d2caf2bda8ce61e2caa98d062e46dba1c8a60b6dfe2b87d7cce08f7b04ed12394d1bdab35059ec34f3ac5e1b46e9821675e892e27cb4b1 SHA512 630d01b4b3854499f1dac7b9369b6219860373668aa237955d4751597de55f04a4acf3dc9f25d6dfb09e834353a4e683947c621b32bbfdd7c422b835de412673
+EBUILD minitest-global_expectations-1.0.1.ebuild 410 BLAKE2B 72a9416b3b38312a01f2ab9a8aa09f9a690733d5028886c252a2ba28f70b747a8861d8ab41c8cb66c13a9399551952ba3fb07d78a0cd9fcd47ed5b155b0090c2 SHA512 7445c4ee506d768ff3726df47f7e07d9aca8b78f578ab06b30f307243dd4d93c5c76c2e437a4cbb6df0c2d857142735f65d6cbe4de9e9b4c34e4a0114b9e2af3
 MISC metadata.xml 366 BLAKE2B 851420e93e857c2d26c11ed324a9db64306ffe71c00e1397f8c2f3eda2896f6ee63073be3bb131ddbd3a9e580fe35bbe0f6375438b34e2ecbd0e2527fc5e9fe2 SHA512 3e762503c0ee2cb739096beef82fae8686304a3c1a4f47a26d9326105b740ef5b0110baa5f108f41f2709c8558667175cb0fa214c0a726e1cfc676b74cb4209d
diff --git a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
index 9a4ef174a942..1b87d7952336 100644
--- a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
+++ b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
@@ -11,5 +11,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-global_expectations"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/narray/Manifest b/dev-ruby/narray/Manifest
index 675624dcd284..14e52bba06a0 100644
--- a/dev-ruby/narray/Manifest
+++ b/dev-ruby/narray/Manifest
@@ -1,3 +1,3 @@
 DIST narray-0.6.1.2.tar.gz 68621 BLAKE2B c4e48b81fb0d79cc49e32ed8204d9cac3f483eb44e1207f422f5b272bb8891836d81cd83c090f4d643677b1159801c13d15580504e6ca244a2a75d4b6dfb3204 SHA512 51e9bec0b711e79e268b73496ad742b80bb46a6e9ea6aab9a2535a700b6efc8f7ae2e854f5772d434e3d385d81275744dbc796ebec4d3de73f2ec0546bd2339a
-EBUILD narray-0.6.1.2.ebuild 1286 BLAKE2B e7d9d9c5445699ed89d5548e0f27c1c56308b261969c2846e45565ca6df027321db1a53c75ce4ba74f859060e62cd1620093016a4bf8294df7f49a71960a0030 SHA512 cf124bb3831b6a20fe6d6c2560b567e35cd68a8e4079f56432ed7108d1aeece60a43e0fe3d0897d725558eb6314ee92edfb9f7f9fc91c58195013a6a167e3eda
+EBUILD narray-0.6.1.2.ebuild 1286 BLAKE2B 80e04265fcbc888aadd17129ef777e0fe0888cfd64aaa18d76eaa02410d76d1da69ca79708d6cd6b89ee436eeb9e15d42ae7582869e3114c2249a051ef62c402 SHA512 9d6d92151c0e8ce8b060dca1cc8b2a4e91c87d3c460954ecf9fc1907d5bc6323f9f30ef2cfc7970af786b53fbd94fd68cfbf169a1a961524d52c1619cc3329c7
 MISC metadata.xml 339 BLAKE2B 9337a45d749879673fc180a12d5e7d27326fdfcf326f86ccc45fc2ad10b7eff1c4575c1379fb6b634f1482b7adb40531f78cc0b556148fdd622b9807e11122b6 SHA512 47c9372c3fa2a28f5d728cd9d3df7b030c2e0bb2378099c287018cd55324a188eb2ef8c901b52acfd87d278c4990752a4860a7281e062f4209bf92c10bdc36e2
diff --git a/dev-ruby/narray/narray-0.6.1.2.ebuild b/dev-ruby/narray/narray-0.6.1.2.ebuild
index 8972cc9b257f..7ad3e23d174a 100644
--- a/dev-ruby/narray/narray-0.6.1.2.ebuild
+++ b/dev-ruby/narray/narray-0.6.1.2.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_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index 519ec7de8a1a..9630905508d7 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -7,6 +7,8 @@ AUX net-scp-1.2.1-raise-correct-errors-net-ssh-4.0-compat.patch 1230 BLAKE2B 52d
 AUX net-scp-1.2.1-raise-correct-errors.patch 3046 BLAKE2B aa0e36edfdc85c944d3ba34d351abe93a7ade694e81240c47956b5767ac6491b954755ea05de27dfaaefa7ea1d628c632aeaaef6061f8017e9b2c114d923382b SHA512 0ff40b546aff5d0bec7245325d5e076de06f719512e51aadfd2f3b66f727c97164629e37b85fc0073eb7134cee3de43b4a0287e965012758c5fd997eebf9ec6e
 DIST net-scp-1.2.1.gem 32768 BLAKE2B 67abf0b66aa6e8f28bdfa314a20f594eedafc5aeaf5d0ae8884cb7e27203699a791623968da98aaebda1630d47bf5859cc3e38875fe17dc8c7ce7926b50848a5 SHA512 64645a4517d6e408e3acfdb24576c8ded3b6ff981035ca10a2e081f9e3ab093f97b4848da4acca03ade364483766677e31296d09a31db4c81eb40123fc966829
 DIST net-scp-2.0.0.tar.gz 27835 BLAKE2B 2f5c9504ade26226a31fd766869f4deef3b344e99e71f780f184361efc75cad880c0dd266779d7f2550f176a86e89740edf27943c9ed81691378e5c3bf3241f0 SHA512 cd3470dfb2afba91911c429828d158e97e4feb17e211807abb05ab251622dc066e392521de250a8f2d4cf9d53c79598d636ef70c559b6aca7e1e7aa59ea3b36e
+DIST net-scp-3.0.0.tar.gz 27947 BLAKE2B 78a1100b7602b9c09c8f06228b6e564fce15133c6cf8c9816613cb56b1d3805d9393700eb66c3710e482771e4116beae393c12ad12963b85428e21e7cf105218 SHA512 6d68b75124ccd2d387983f6d66a8b0e040132ba17d942631c806e899dff757ffae7a031a27ea0988166bf56e803c1a6175199845a848b92c7064388564e0ac79
 EBUILD net-scp-1.2.1-r1.ebuild 1127 BLAKE2B 09ef4de63e9204224eaca6a35fbe1718f2e72e94290c497681413358589897e18a15c5e3f06b38b04fc300fd5772c81e85996e52b3f8e5af4845931ace31e34b SHA512 20bf82aecc0a1c23f24026695ee1b8b0dc4271d1eae5af68ad4d945369ac2af96d26e856dcd520260a21ce8922e77fe5e105182ea07cd8de5c175aa9cf86e1f4
 EBUILD net-scp-2.0.0.ebuild 1128 BLAKE2B 66b805e501c4799fe7d6b1a6d1161b896a78eed58fb8d54539c5feef8632edcd5306d5395b336cd3b3969899ef7285ab32aee6c5c127d19ca238b3c7a324f9ed SHA512 b4ee431b74a2df0dd91d77e9fb2224914eabe1e1250e65f38c6e1890c2edba808caa23c41f31a4e0839c70426f70ab6a0af689857f67b4e000b43e41a1074036
+EBUILD net-scp-3.0.0.ebuild 1116 BLAKE2B db0252494d9234466cfa3b0bc39a7d77d4821f45fb9ad87b391e551a174cdfce7bf090f82a00659b5475db397c960dad38f2a3d99d4deea915dc191a8c1a9f87 SHA512 5dbfa21c451fc1f2bde6e932358f71ea108f34797dcbdaca49c404582636eea66da8b8abb210d31367e4996bc304fc23c905e4afe4182f0285bfad1eb46ebf79
 MISC metadata.xml 341 BLAKE2B aec6f820a216a818e7f6a82ffe48f73a01cc662d9a5e10a5dee98885f564560644e377158ccd5c4cb6e914205fa5aa6753aaf5dcd52e1849437955553f3c268c SHA512 bbb71a6668f329ca9b1f5636aa71720a8234a7683fe374b2fde4113ff56d3a5c2242bcba7e3023090a7955870715e0040d990326942def6d3be7e31d5f07d39c
diff --git a/dev-ruby/net-scp/net-scp-3.0.0.ebuild b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
new file mode 100644
index 000000000000..78ae6a9954b5
--- /dev/null
+++ b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="net-scp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby implementation of the SCP client protocol"
+HOMEPAGE="https://github.com/net-ssh/net-scp"
+SRC_URI="https://github.com/net-ssh/net-scp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	doc? ( || ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 ) )
+	test? (
+		|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 )
+		dev-ruby/mocha
+	)"
+
+ruby_add_rdepend "|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 dev-ruby/net-ssh:4 )"
+
+all_ruby_prepare() {
+	sed -e "s:_relative ': './:" \
+		-e 's/git ls-files -z/find -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test test/test_all.rb || die
+}
diff --git a/dev-ruby/net-sftp/Manifest b/dev-ruby/net-sftp/Manifest
index 159b9d2f3dd4..bbcbf149c30c 100644
--- a/dev-ruby/net-sftp/Manifest
+++ b/dev-ruby/net-sftp/Manifest
@@ -1,5 +1,7 @@
 AUX net-sftp-2.1.2-net-ssh-4.patch 1628 BLAKE2B 1dc8caef775ca06c80f485732acdceeedc10aaa96e33c1c6c59ce5e1596a71a229aecb06092b3a265288ae46469d1c72b4a0de8ec3d50cba5fe0947158c3181e SHA512 dc4e99f13e32698bbcfe1b07e2ec4baa1ed9beec5bc3816c016f26b053f7134bb9646dc538a0d03f2f3bda4d8d51d9742a5be54dfc6f9340cf2861e296492855
 DIST net-sftp-2.1.2.gem 67584 BLAKE2B 6b8e15f42c7a18f8c9aa7118e5822281eda6505c34697282cc9c52375ea0e4042f3045f41c2e9a15b8fd20f02946bfe6f3ad557aa5859a8e54e4c0ae8bd1d53d SHA512 126a9537a4ac45150096db4d46ad19e0d8a1833fef3733a1b66ff01463c0d109415f0ef807706ff88be8c5c1395bbd4620e529f06e3c9f746a4ed6ec2cb7d18d
+DIST net-sftp-3.0.0.tar.gz 63542 BLAKE2B e09e209aa0d102a6da7611cabf49970c9a4e572d51946d5dc0688879db97c92e8a39713dd0011a4234391ff0ab685a978c491917c041f7d10a8f092fde5c876a SHA512 c28411cfa8522dec893fe7a1588a16bb761a9d7692c81c453d9a9ad817988637614c6afd754db8547e845a16062882e2b7e95974b889631676f092d9e84b83e7
 EBUILD net-sftp-2.1.2-r2.ebuild 581 BLAKE2B 245f088a1cdc169ee22d77c3528fd198ee92ab230c77fde7aeea6ef0909d2792be36545ee428ddc5ffb4469cd88a57129c94d48557e87f5011928515ccc6a026 SHA512 c2ba65891c5cc82556c5d08de5d32da771c06734285cf32671ab549acef378b9a1702220a85c64ef51851d7d0e88f6c286665bf2fa1f3e4002e4c351abbf2751
 EBUILD net-sftp-2.1.2-r4.ebuild 587 BLAKE2B 619135a437dbcaa904e8b93bf32d4f18599719b484a5e14bdf910222a736edcd68d12556744f83c8f9952eca212081c8dff1f805728f0507d1491a2b735eae9e SHA512 7709fbe42e15d896df4b99fe128991a8c56949d419d2f8d064714b7abc4579426f74797d60b90a2dfc58052839f8b8a3e54329d1ab543f7212b3bda235764e35
+EBUILD net-sftp-3.0.0.ebuild 814 BLAKE2B 4b106f8c2e2e4a3803a6eef28a6396333b7a7178f068e529290d2b33cf3a36a2d6974486fa8112415856ffea9f28cccc826bcfe32752f83b6a7791d8cb95d48e SHA512 aa3de134aed7d246893b1c5b46dbf39bd8a01be6ba5cee051040deca2fec28eb96c539bbad0445e1186a856a438ab89a0cbcc36c9e795d277d654574d20bbba7
 MISC metadata.xml 342 BLAKE2B b52478d886842e044705cc42c177577f111b2c01140b58d322107ecaf20bc1b5db9763ec0f0e67397118515690f452b51c1e14dcf6bada17d7c5f18889571b07 SHA512 3ece29fffeee2912d0bc06514adca69c2bdfa95bd88173d4f42cf0aee00944adc71bfaec6df543f0c1fc1717b7a808459f30894977154f7acce289dfb491f6d9
diff --git a/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild b/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
new file mode 100644
index 000000000000..c6c73304f94a
--- /dev/null
+++ b/dev-ruby/net-sftp/net-sftp-3.0.0.ebuild
@@ -0,0 +1,31 @@
+# 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="CHANGES.txt README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="net-sftp.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SFTP in pure Ruby"
+HOMEPAGE="https://github.com/net-ssh/net-sftp"
+SRC_URI="https://github.com/net-ssh/net-sftp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "|| ( dev-ruby/net-ssh:6 dev-ruby/net-ssh:5 )"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.13
+	)"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index 5eaa9444b977..088bc81e9b55 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,7 +1,9 @@
 DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e9227379cbfecc3a506d870d8d9fa528f59b605df4ff02ae6bfc16893bfb22734395096a77fcbe19fb939ecc1a343a9b5 SHA512 0a3609590d797a8cb4732e8cf743606a4919f57475b6eb2447a3db0c28f1bd405804fdc47a4062e503acdd4b785a1de9794a6db433cabb884105166eff6a8c5b
 DIST net-ssh-git-5.2.0.tgz 209986 BLAKE2B 6a1bc97da733420607c6ebe69a01f42d58998297a12394a29c9b4f5af425781d6b1b3535cecef21a0918eefc2e032f519fce9c5691c0a735c7810452f468d780 SHA512 cf2fa9817b124f0f35115abef51a4865073b3126b94d66cd307994bba06745513aaab1c1bcf64907a7b3bbce793b272b3f521cfa93f9339ca78ec8cef09cbeeb
 DIST net-ssh-git-6.0.0.tgz 218503 BLAKE2B 5cd2126513233eaf169fd0eab4876e7c0c4b61f7cb3df19d7e369403fbba39ee68f4ade61ec58ed9124c460af5d39bc93ccf32a320ea19d02fc3d34bb8413f37 SHA512 18dd1f694e6b57f6f22c356a0726f5eb8aff9921f097b50f072c2829c4bda8fa697c5e71a49da862beca59a703a3146b29b80f8b5dfed3a3b661e05bc68b3387
+DIST net-ssh-git-6.0.2.tgz 219657 BLAKE2B c514237e6edf4a9f7581850a1a5ecce352fd5f56c633587ddc26571c6bff06172f177168d8e55d053615050fff5d7f0946c4aafc0e31890ea630b741c99b27ee SHA512 f6fa4ab3b009429e08d76bf412bb0a93083c17d58ad6e24cef7d4152915dca2d335a533223ff57b65c9053a7ed5df4905e3231d50b0d52ea03f6403a6c1cdec4
 EBUILD net-ssh-4.2.0.ebuild 1111 BLAKE2B 46f70eafbe7498c6ffcd621e3d7a4f0543bb91d0d52ece3a9ca55ec2888428d8ee728993ff326c205fa2dc0a0514cf8a7ca3c444b8b13f07f3ec40527af97de5 SHA512 0c076ea6e44ee5697428c7d2cec3780f1c7f522008abf0267cac9be1aa0868faca8aace807fb811e5917511f083dcb0b757a3996a9070bd1d72c9fa77e4a7e07
 EBUILD net-ssh-5.2.0.ebuild 1032 BLAKE2B e19af0235144a5bbfa6e15c3a94789cfa6116a77a56b64e70040546849a06f8072632dff3fcb55e29576317438ac48c715aedb9d093933775b4759426e020d71 SHA512 03ef7ae6bd2ae1537c11ca88f250dbf0eb79f3d0a9db1dc30f386cfa165b6f4d1095e848da9c156cc31185fa8b5374c739c289558fdea3e06a06507106852b12
 EBUILD net-ssh-6.0.0.ebuild 1219 BLAKE2B 134cd76dc5ec6be617b7a051e4798829e7f5fd6fe1d719c7f8382eb76dd7ea933cd845b9f91f44d130375226cab06eb05c62ddebcf4c7358e82dd4f1ed66139e SHA512 aec9e65566a6f64dfae1ff4fa44e41ec8e5b519e28a592815696393a4e348b7ffe712913be0efe390cb5425042b83e65419571427e9864460deaa6c2ced2265e
+EBUILD net-ssh-6.0.2.ebuild 1219 BLAKE2B 134cd76dc5ec6be617b7a051e4798829e7f5fd6fe1d719c7f8382eb76dd7ea933cd845b9f91f44d130375226cab06eb05c62ddebcf4c7358e82dd4f1ed66139e SHA512 aec9e65566a6f64dfae1ff4fa44e41ec8e5b519e28a592815696393a4e348b7ffe712913be0efe390cb5425042b83e65419571427e9864460deaa6c2ced2265e
 MISC metadata.xml 542 BLAKE2B 0afb600fb7668a66e39bfe556157fa6a91eaf67299ba7560a550d041fced876a66ffc83700983fa4f3249a35785e93a7d980ff0940365df1fac626f22189a863 SHA512 f350079143da9f4e43f9da43556d343c01b88782a3d4fe8bdc08a7c901308f352fc9cfd0f998bd4471bed923ccbee0fd1d6112cfe91fa7b71ce9f39a665bcd60
diff --git a/dev-ruby/net-ssh/net-ssh-6.0.2.ebuild b/dev-ruby/net-ssh/net-ssh-6.0.2.ebuild
new file mode 100644
index 000000000000..124bde4b5785
--- /dev/null
+++ b/dev-ruby/net-ssh/net-ssh-6.0.2.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_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.md THANKS.txt"
+RUBY_FAKEGEM_EXTRAINSTALL="support"
+
+RUBY_FAKEGEM_GEMSPEC="net-ssh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Non-interactive SSH processing in pure Ruby"
+HOMEPAGE="https://github.com/net-ssh/net-ssh"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="ed25519 test"
+
+ruby_add_rdepend "virtual/ruby-ssl ed25519? ( >=dev-ruby/ed25519-1.2:1 dev-ruby/bcrypt_pbkdf:1 )"
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
+
+all_ruby_prepare() {
+	# Avoid bundler dependency
+	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
+
+	sed -e "s:require_relative ':require './:" \
+		-e 's/git ls-files -z/find -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+src_test() {
+	# prevent tests from trying to connect to ssh-agent socket and failing
+	unset SSH_AUTH_SOCK
+	if ! use ed25519; then
+		export NET_SSH_NO_ED25519=true
+	fi
+	ruby-ng_src_test
+}
diff --git a/dev-ruby/nio4r/Manifest b/dev-ruby/nio4r/Manifest
index e11ef58b9764..c94ea01e9fb5 100644
--- a/dev-ruby/nio4r/Manifest
+++ b/dev-ruby/nio4r/Manifest
@@ -3,5 +3,5 @@ DIST nio4r-2.4.0.gem 101888 BLAKE2B 05f0223ccf493d3566d370e3199b26136b4158939fcd
 DIST nio4r-2.5.2.gem 110592 BLAKE2B b632322d0706f97a30601e7135daad9ee5a66e57ff7dea1eb0b8365e45f896e7b8a7c228c4eb781d2f44ea047eb028549bc172b68a0540d041ad83bd79d25075 SHA512 3db567c9994e9186749e37c3ebc07f744e7a82c1163d44222475cf491f945745c6c070f4a0a8c77e331921147cc1f5f7bfffd86cb3455d5864280c4e4945b295
 EBUILD nio4r-1.2.1-r1.ebuild 1009 BLAKE2B 1e03d4b0f3fdb2643ef903fb78872a4e050b2ee7a76f21a25ac0070351487b94dd7bb423302c352372098828b7e8015b8852a93fd4fdec55401dd9a4898dd0a1 SHA512 bfac422750ae73a1c5046659b007e22d486165992fdc1ac73f0c68b0c4cd4c219c7a51573beb1fc9cb7440b09074927a581018420cdc18bd13d05c89414f7c22
 EBUILD nio4r-2.4.0.ebuild 1062 BLAKE2B ed0987909ca667cc5db3b550f0d129e6413242082a2b00f61a66661c08064dd961fa4d6470e82c1f3e84b899e62da06374d112ce102dad430e5544d435a7bffd SHA512 26f3e3245a9a6d580f5a0c59ac58bdcfa87b5452194488edf92b00b9a5ce3435a8980565c65dda3f591317b0f0dd59204a38db48ffcfbdb57124dce909c0eabb
-EBUILD nio4r-2.5.2.ebuild 1088 BLAKE2B b50c0a97d20c9b095cde8d0207cde78dec8a34a3c779407425541e5195d8473c85e37a2eafb4862728cfeab538a89641ce9e99ae5d0ae6141ac411b36cf2ecae SHA512 a3acac4373a13f71841aa4ff9490e4ba4a64477a30d6fba4534e437de02f5fc0c99f36d8088ac264d4d0ec94b06c050ea4b1e32efb1f8c76a3bda55fcfeb6b07
+EBUILD nio4r-2.5.2.ebuild 1095 BLAKE2B 39fb353b75619c4497fa355e7faa3bb4d1b4612ac3c90111c235ae7846a0242587e45070292b1a102a99b136f80d9e50ea4a9ca2d36b6ff66c69cb2baf8d3305 SHA512 d81fdf5f2b56bd4e8a28dd4e78fd42fc5f9d4ec2e5fccc01a438ae946c60482bdba2d8f18076f54839bccbf1c472951fcfaf841978b0d3e0de844e922f7aae85
 MISC metadata.xml 341 BLAKE2B 97c99a0ec8181c92b543ec63b8d1a40c8cbf88905afe02e6f13fa5e8906755bafadf426b7845f2e9bb0c1244168796d661a44e5138eca44068b142a39d3ad4d4 SHA512 8ba86bd5b9b9823cca53bdf18023db7385332c31fcaade177d394a36d60b892fcc632fc91b60addb77fbe907130682b435ab6103a33c71f2ad172b345e6f389f
diff --git a/dev-ruby/nio4r/nio4r-2.5.2.ebuild b/dev-ruby/nio4r/nio4r-2.5.2.ebuild
index afd8807d17ec..44567a91f631 100644
--- a/dev-ruby/nio4r/nio4r-2.5.2.ebuild
+++ b/dev-ruby/nio4r/nio4r-2.5.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/socketry/nio4r"
 
 LICENSE="MIT || ( BSD GPL-2 )"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note that nio4r bundles a patched copy of libev, and without these
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index b912c88c5e91..04129ce87511 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,11 +1,5 @@
-DIST oauth2-1.4.0.tar.gz 21299 BLAKE2B 1fe4640b374450279e556477c23972030d3aecac4c96e9174e57458deaccfbfa012e3bb66fe3db5e845a4004b91b763dab6f68b885ed7c1ddb2710cda29a8486 SHA512 2db67cba2403be8ea5d6f88f9818f295c29c08201f8ea5876c55cffe2fa926be465a11061654adffd77d13da9c7e56353ece7e4595cd9501acdcfeb58573b300
-DIST oauth2-1.4.1.tar.gz 27946 BLAKE2B e6edd113db26bdad09697c45efa5490bfb49b5c3fafdb7337c5f5c2b135025cc43fe7de450b3e106c6abfb8acb3afd676181ebd6aa1c18f6c5255597b04006df SHA512 14c039d19bcd177506e2f6189797b1791b54bd3fbe53973ad471c44744e3179c02e2f7a855a0cafe332e66819f1708d86c1dd89cbe57668ad642efa49e924b25
-DIST oauth2-1.4.2.tar.gz 27168 BLAKE2B 687149a111247a9636985447e82f5776ed42333e85bea6e0c61ff8f05759ba66dd1d418ca6efd7f1b5de5b56a731f889fc53f3413f5fd426b73ee6d4ef9ca929 SHA512 14075637431c6636a51d49930eae14c0328b0325add4829703d539c70b8cc35285acb02948a90717ab44f9153a0a9425b2d1b6559641b790ec133935904391f6
 DIST oauth2-1.4.3.tar.gz 28278 BLAKE2B 6d0055875073dca48e94a0449a5fff22b7be280c5b2f8e0b5b3234b3c8b079fde0671e211b0eb8d562bfc0cb437917adccb3f13c38450a8cd6a43f0f1a2373a5 SHA512 6ffdc7675ed301cd52e3320c01723fe2530a9dedc2b1fe534b42d01dacb7d4b017d79dbe0f9768f06ed8ace7ba596f9824a38d5509e82d09a3456f3a6b1fe453
 DIST oauth2-1.4.4.tar.gz 28477 BLAKE2B 925008fcf4dd48da3b17c539713bf0f05f649d431ab1676293de625bef4165f31153271d48bbb0c6265c67d7bb6a3cbc7217ce155ba331b22a00d572a855a8ef SHA512 5398a25664e53d1942b0ecbe5d74ca9cc8f04a928c96073f40cfff207c4bf220634185320954a0d1f36944547fb48264855c9523318fbb79dd4a3779a7a46e79
-EBUILD oauth2-1.4.0-r2.ebuild 1393 BLAKE2B 8d85f689841ea25380c6c22cf8aa2b0abadb615e6df260980901790ea77718f11c28055a47863593f4b13f163d2afa15aa0cd6098c896a946f16f6f22b0822aa SHA512 9b68eedf5b6305ec3c87d441c24a43ea0129afc57bfc7547a0a493ccce0e4ff51052a41811b1f5eef946e8683aae8c32002d1a8bf1bf4bccbeda25397ca9a507
-EBUILD oauth2-1.4.1.ebuild 1407 BLAKE2B 71f2f6bc31fe735d4f9a9f5f8f1f40ea9b4d6ec7fe1663a0851936dd440944e0881248130a51bc350f1ab65cb8c052af68ddb818e1ae513c22924e570905d9dd SHA512 c0f7fb8eee1453e790c815f143c978adc07075f566da7d08e52a63c67e8bd27380e897ac419c14d98c42c3a187736fee9c42c145d95d83494b829ad067e60ac3
-EBUILD oauth2-1.4.2.ebuild 1394 BLAKE2B 6e12ba3e453dea8defd9bb1252cf8110946f20273963423034586b657073848ee4e5a348b4e47d249aabafdfffcad9d4672bc1382889802d379717329745a412 SHA512 3b3ecec40baaf8b7c6a7a22f7c9d35c501df39c75e2c16d8eaa18bd2fe43ea8deb1a3685d9e2312934692a4055e02b414f45b2e5129e22ae279e493db0d5a05d
 EBUILD oauth2-1.4.3.ebuild 1394 BLAKE2B 6e12ba3e453dea8defd9bb1252cf8110946f20273963423034586b657073848ee4e5a348b4e47d249aabafdfffcad9d4672bc1382889802d379717329745a412 SHA512 3b3ecec40baaf8b7c6a7a22f7c9d35c501df39c75e2c16d8eaa18bd2fe43ea8deb1a3685d9e2312934692a4055e02b414f45b2e5129e22ae279e493db0d5a05d
-EBUILD oauth2-1.4.4.ebuild 1411 BLAKE2B dadd213629a0223a6d540bfc6fd4a1581d9a328ba5be8d28250c3bcc5cc990f307f8a59950b5a55496eb70fb756d3daea3c1d1aa7265e6986e8be01ba492055a SHA512 317937a7c11632ff2665eb52f171196e3022a4d82481048d3017a368335e15760b909c638faa2833b3dbb899a80138c5e81c6ff77fabff2e2c7e7e5a453f0539
+EBUILD oauth2-1.4.4.ebuild 1441 BLAKE2B 429bfa3448a7eea2c5eba926c8834df457f73d31e1c9a3fb54e6739d8fb96228d1968548cd42bd934e8923614fbce8a5304ed7c8f506280d3e2fc82c92d96060 SHA512 b2b07b1348fc2243556ee02e5534317509570d872c75862299a63ec7af04e170a68a135dd6017d5c254959415b958d7f4a3040d821e98043f62824d51997a617
 MISC metadata.xml 341 BLAKE2B e2896d1d266992c01ed373b489cf71b9c4a7a5f57a2af37899ff63793dad41b9213eee0fd94f269735f630815819f0a08e51e8739b89a7e251b60c2f6894e26c SHA512 33c5be74161557ae3e5888730256536cd02baac6c26913add84d8ce90854c4a3bb57c31fec1287bf560268c681ea3acf2119f2fea3162dd07e3962ee34d74f9e
diff --git a/dev-ruby/oauth2/oauth2-1.4.0-r2.ebuild b/dev-ruby/oauth2/oauth2-1.4.0-r2.ebuild
deleted file mode 100644
index 283663a9010b..000000000000
--- a/dev-ruby/oauth2/oauth2-1.4.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.16
-	>=dev-ruby/jwt-1.0 =dev-ruby/jwt-1*
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/faraday/ s/0.13/0.16/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '1irequire "uri"' spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/oauth2/oauth2-1.4.1.ebuild b/dev-ruby/oauth2/oauth2-1.4.1.ebuild
deleted file mode 100644
index 93742d94245a..000000000000
--- a/dev-ruby/oauth2/oauth2-1.4.1.ebuild
+++ /dev/null
@@ -1,49 +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="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.16
-	|| ( dev-ruby/jwt:2 dev-ruby/jwt:0 )
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '1irequire "uri"' spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/oauth2/oauth2-1.4.2.ebuild b/dev-ruby/oauth2/oauth2-1.4.2.ebuild
deleted file mode 100644
index f046e1a04dd0..000000000000
--- a/dev-ruby/oauth2/oauth2-1.4.2.ebuild
+++ /dev/null
@@ -1,49 +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_TASK_TEST="none"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-2.0
-	|| ( dev-ruby/jwt:2 dev-ruby/jwt:0 )
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '/silent/I s:^:#:' \
-		-e '1irequire "uri"' spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/oauth2/oauth2-1.4.4.ebuild b/dev-ruby/oauth2/oauth2-1.4.4.ebuild
index 97bbd0773f1d..50da772debc5 100644
--- a/dev-ruby/oauth2/oauth2-1.4.4.ebuild
+++ b/dev-ruby/oauth2/oauth2-1.4.4.ebuild
@@ -28,7 +28,11 @@ ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-2.0
 	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
 	>=dev-ruby/multi_xml-0.5:0
 	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/rspec-stubbed_env )"
+ruby_add_bdepend "test? (
+	>=dev-ruby/addressable-2.3
+	dev-ruby/rspec:3
+	dev-ruby/rspec-stubbed_env
+)"
 
 all_ruby_prepare() {
 	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 5d8485348f42..425bd8ee9d24 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -4,10 +4,12 @@ DIST parser-2.7.0.4.gem 726016 BLAKE2B 168462c98cf21563cfef07783a8723201aea5ffce
 DIST parser-2.7.0.5.gem 726016 BLAKE2B 556d4b580f7efcdec484646db59b623f9f40b0959e8751b2cbbfcf3fa84c0e82dac06d2df88df77b4d1d973c56e17190a1da85523485d4a36feee4042890dbac SHA512 5358c7004ca06ee50f38906145a1d357b49a23f1ce461b72b8cb5558e91aee18b87fe5eafa7df1b356d47a3ddacbb7cdff8fc516470ea6ad6532be1782c05a82
 DIST parser-2.7.1.0.gem 726016 BLAKE2B 55386c4d2107230e17d1bce7997c15512024d93e65e21ca7d1e850e433dcaf7daa75d180967b40c109d3361824c3d9e1c6ef992602c6eec3b7a2c9679993bc72 SHA512 f6e4e814836798045c9eadf84aefe0394b0e8b3dc47d9e6c0e7e372cc4ad13653a45aac10c03e94f79a879b99cb43eaf8cdc4a899a41d463ecae76205d2943a7
 DIST parser-2.7.1.1.gem 727040 BLAKE2B 5deb439440cff0f95cfa99969a70c926a82bb0d30f842f0a0915e2e1b7dc6eb4c12e059e8b2f8882b2f772777d611de7ea9133f68a6b0a5954c6446f2dafd1c3 SHA512 29345f4cdbc424e07184b97c4dfab39be2b61f5ae57dba53ee8775fa0251b23f01375f281922f65c64cb0f6998f87144e685db2c9e0815ea7747ea573fa38f56
+DIST parser-2.7.1.2.gem 782848 BLAKE2B 87a0ca30fe277d88a8ef013c450ab2823469a723906ecd67f4ed859e016d5df25b1c976a47c2333e538b7e8b99ce948e58f51a1a21c7686439382ff1e11e5222 SHA512 74c44c64d305de18de745ab09f63041d73435aa4c5a07042178a8a6a35cfdef30e1b55c02c7e7dc97469b8c46a705159a4f746da1c3b3f3a74df1d2d830ddcd3
 EBUILD parser-2.6.5.0.ebuild 723 BLAKE2B f97cf615515e70de2f4cf9201c13c655c79b2eead20c9348b1b9f1d8d728d13949abad560f31f42e2b1870125ff035e7fddeabb4aabd2162ccaa9b322f1e6c69 SHA512 0efc32d24c71d8cd898bb98dea0a0455b59f5178871b3e63d2a1ce335ea3b4c0deae2d79f5aa2e5a9265f3b1090d81c623b17d73126e97718f0a7db68c104466
 EBUILD parser-2.7.0.3.ebuild 730 BLAKE2B 6e275cf8c0d6bf74bc85a3c71cb7a7a637db72e054817dc364c1373c44503a63b55485b2cf7827fe54972a0f85134cba0578baeb3b0321c932499803c4b6c704 SHA512 bdfa44c4a1a537b28c429a9ca114598afbedf4515b18f5015799ee38433e38d41d6bd2e0c1d268140e2e3971a22b0f23786e39c2dc155fa458f20802895bf705
 EBUILD parser-2.7.0.4.ebuild 730 BLAKE2B 6e275cf8c0d6bf74bc85a3c71cb7a7a637db72e054817dc364c1373c44503a63b55485b2cf7827fe54972a0f85134cba0578baeb3b0321c932499803c4b6c704 SHA512 bdfa44c4a1a537b28c429a9ca114598afbedf4515b18f5015799ee38433e38d41d6bd2e0c1d268140e2e3971a22b0f23786e39c2dc155fa458f20802895bf705
 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
 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
new file mode 100644
index 000000000000..a1dfc9b62aad
--- /dev/null
+++ b/dev-ruby/parser/parser-2.7.1.2.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_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitest:5
+	dev-ruby/racc
+	dev-ruby/cliver )"
+ruby_add_rdepend "=dev-ruby/ast-2.4*"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
diff --git a/dev-ruby/pastel/Manifest b/dev-ruby/pastel/Manifest
index f7d55dd285e8..de4dce75c8dd 100644
--- a/dev-ruby/pastel/Manifest
+++ b/dev-ruby/pastel/Manifest
@@ -1,5 +1,7 @@
 DIST pastel-0.7.2.gem 49152 BLAKE2B 37380dd9f44f2e816628bda1ed359aeaa961c9b1c18a0e76b4b04fea39906e53601aba17fd2c1cd0571357697296ee1afce3a52fbdc33475a1560c3c2f52e567 SHA512 83cf7ef04800a77ee91692de5b89c6bfe6590be72f24dda74ee53809b14b7e2e9c6e70e9a829eff7aa8dd02a191057dc5f5c5528d36fe2bfd211e1c499d276f0
 DIST pastel-0.7.3.gem 22016 BLAKE2B 0e883969446c9c64389a6280de3f94c6e4970321051bfa718698ea0ce2594ac9a36e32f29946fbceb98015644d529c8dbdafb9f1fdb2fe0825b3d9477b75f4b8 SHA512 71cefdac478c709c8d4899021438945c841e4eada2411aae3165e8444835bd9aed27ad9083fe223b115206311fa579d4160cde136bd7a21df5bdcf2589234177
+DIST pastel-0.7.4.tar.gz 48176 BLAKE2B 3564aba28f9315d2f988dabdd0686e6c7a53c1b200e6e03519c1ebcde917503760d4f0d790e456c7a732b47535f692d7f5b88cf786e5b4236e9b2e8b5eee66d7 SHA512 a1ad8487babd1e788282e141538855370e09bb2745731670b814cb4572c54e0568955108f7657809b98f92b94d9d94cdd555e2db8146b20f80db98bbab3512ea
 EBUILD pastel-0.7.2.ebuild 571 BLAKE2B 39dbca0dca14b5c1c2e7dccc36d4e808645bac5aeb0b0b83bca972ce1708a2da08079834d812c0ce336fe66e9deee23f2633714e241fd35ddf75c9b89bef586c SHA512 a0c67c9c828c846d2d9b5aa3ed3e4947f7a3d924acc446977e5a7d9620dd40139b2760f85fac098a5f9e6e78b07acde75d0ddc015a2f25e799e7404520492b8a
 EBUILD pastel-0.7.3.ebuild 582 BLAKE2B d61a60472de7d44f1c55e4179cab9c54b938cb023c45e4f52b0f936bb1fe657d7436f049ff5c24775215c9b9655d437f3033ccef3e669f6587a7633518d0d0cb SHA512 3bcb95ee9adceff238aa2e3a8fadf29733e230c0b2cbc4f558a1f2bac953fdb0d5be3c931ed26cc8154442d0ce92640f1fe5cebc726826ec587c52b250703104
+EBUILD pastel-0.7.4.ebuild 770 BLAKE2B eb2478af74a467d8a9590019cf5e32fdb85021c80628759909872cbed943b5aa2dd1ebf19df6d9d82908cee489ec8995bea4333050ddb06e02bd4460eff9cd9e SHA512 fc0ba91e34d06dc2ccc92a4745a2c2edb9451dbca2a8f7644c1522fb5e9fb85d39b0a4bf74b5399ff6449a565b6f19f60309a075e667b7cc3a60d15578266153
 MISC metadata.xml 334 BLAKE2B ddfa0b28da63b435e81befc3fbf736344f8e83ba56041757fa1ab0883a73bdb0d4f4d5497b2e7a6d7b215d39ad73195fcc65105bf5baa6e4ed2081a41fdcfac8 SHA512 4432b29f441206ba0d37d7be93b3da6b06146df6d539a07aadba423fdd43f2ac765259c0179123e1421935d6b69561a0a92f2b5b5eb634f359d0ace7cf803080
diff --git a/dev-ruby/pastel/pastel-0.7.4.ebuild b/dev-ruby/pastel/pastel-0.7.4.ebuild
new file mode 100644
index 000000000000..fdd5b02e3bc1
--- /dev/null
+++ b/dev-ruby/pastel/pastel-0.7.4.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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="pastel.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Terminal strings styling with intuitive and clean API"
+HOMEPAGE="https://github.com/piotrmurach/pastel"
+SRC_URI="https://github.com/piotrmurach/pastel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/equatable-0.6:0
+	>=dev-ruby/tty-color-0.5:0
+"
+
+all_ruby_prepare() {
+	echo '-rspec_helper' > .rspec || die
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 6bdf9a30615f..ce998d14d6b8 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,8 +1,6 @@
 AUX postgresql10-tests.patch 1747 BLAKE2B e0a992461221f31cca1f39453e077a1d04d3f436e0eba3b683ed42092d266a8edb8a46e61933ac41e94ead483bac325833f1c21bfc57cf7ebb160f046d80e1f6 SHA512 89a7937b0791307366fbc97549d48cb7bdf92b66895b1de7dd554a040ad6a08b4af69709bf1318df95cdaf9824415d76b5f6be98be48995b75909fbfeefb6295
 DIST pg-0.21.0.gem 214016 BLAKE2B 9e27646cd85bc97dedfb980f4851b19a1ef2aad17f6a5c60726c1683642af5c4cf87d518b300fb4c894e1580f808f8af6158b57f1ac25971c1fc55818abee6f4 SHA512 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b
-DIST pg-1.1.4.gem 233984 BLAKE2B 5a92ca49f8e471905286c07dc468f2932461f73fba13d2786c50883b271e2528b4476a81737023c252e75784c49113aacc50e1722fa100d5e97494fe60965a41 SHA512 442eadb4e9fe51aaef71cb5bbe8786c61dc4cfaa1241491270cb251f062abae88b6b2ef88dec7ab6ba2baa6390e954a2fcf4862cc95be4bc516e029c788fa1d9
 DIST pg-1.2.2.gem 196608 BLAKE2B 068be98d190cb4074cc89bdb5b376322f323950909f7a6fddc8669a3ff0f85eef9f512bd2ec7121707e9ea077b2b428f698e84f2118c76e34f5def75ca303fca SHA512 5c7cc90afb75a66e80cfc34c4875cf22b005aa0a27e78db6f71d1829f870c6409b73326a9925f79c0d642e93ea51d1f84c7383323fea44b7488e83deb7754951
 EBUILD pg-0.21.0.ebuild 1683 BLAKE2B 592d776aed1ce55cd012e3545ede8459d72357b957936786384ff2d52b7d36989633449eb6f0a141a86bed60e92c9f3edf3c2cb35ff7fbfa5f742483359a47e3 SHA512 92ffb0555b206b1467e52619394920375912b09900a2c15993bba7d41ee1d77e5264f08780a1a08c12e37fbbe2b712691d6a0c56e45e949b5f5c47bd763c607e
-EBUILD pg-1.1.4.ebuild 1635 BLAKE2B 579e1643af184ff776243f483b52f519b2521bc16813b70b3c8889aacdae050ca12b79b1277f041da54c949f971ee321233f45c6e1caeb565d125fc85aae0088 SHA512 6373ed71dcae54b2ea421c2224b235c1cced0855965859f0b0a4813c292907516c32c410e89cea9e26c1b1c77f18db70c9ca860bee4af29499019ecbdf42a1ed
 EBUILD pg-1.2.2.ebuild 1614 BLAKE2B 0a63616e4f140e6aea2b907e49e07c90b80855c6793f09f284b7b1a59c7597aa77b78d12898d5b5517fc8b987e1632586f42153fad84e838fa3031f97cc1d053 SHA512 a9332007bca96032345d4f1136799a474d78a7eff57b92017f447c384c9b6969780a6926d2bc24e71e8b17154b3737df6ae26dc4631bf4e69560a7ebd9667d6b
 MISC metadata.xml 340 BLAKE2B 8ef2673e4dafd5495e2385e4216ae715d3334c170e81f45f823f8ef6942533ad088115e6f8e3c75b35e2af28cbbf1e3446cfb8b2eb084df7b9a3adc6c869c183 SHA512 76be8c407457ed3f1a8e2caaf5a10949a830d4033d8d18e88830f37d2b62d4ff9675367f123364041ca88f5af972d4d7152c1f2832a5c891b516a83f989e1598
diff --git a/dev-ruby/pg/pg-1.1.4.ebuild b/dev-ruby/pg/pg-1.1.4.ebuild
deleted file mode 100644
index d644ac66e21e..000000000000
--- a/dev-ruby/pg/pg-1.1.4.ebuild
+++ /dev/null
@@ -1,55 +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_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
-HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND+=" dev-db/postgresql:*"
-DEPEND+=" dev-db/postgresql
-	test? ( >=dev-db/postgresql-9.4[server,threads] )"
-
-all_ruby_prepare() {
-	# hack the Rakefile to make it sure that it doesn't load
-	# rake-compiler (so that we don't have to depend on it and it
-	# actually works when building with USE=doc).
-	sed -i \
-		-e '/Rakefile.cross/s:^:#:' \
-		-e '/ExtensionTask/,/^end$/ s:^:#:' \
-		Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/*$(get_libname) lib || die
-}
-
-each_ruby_test() {
-	if [[ "${EUID}" -ne "0" ]]; then
-		# Make the rspec call explicit, this way we don't have to depend
-		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
-		# the whole extension from scratch.
-		RSPEC_VERSION=3 ruby-ng_rspec
-	else
-		ewarn "The userpriv feature must be enabled to run tests."
-		eerror "Testsuite will not be run."
-	fi
-}
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 9c0687e7dea8..c09b06ae400d 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,9 +1,5 @@
 DIST pkg-config-1.2.8.gem 20480 BLAKE2B cc11b5eff30f0f5e1a91e64902931ed540da108fd326fe731b71527c9c4310f55e9002617e1baae4f71a4b705b20cf10f6fa112f8ef56971e82868145d372a47 SHA512 d83a599a48c7d404946054c6846b6cfd9fce2a264c288519a6eccd9787f05d45397dd46300bf97c80700921456318154ea6d44ba32cd159803471073c2a2b065
-DIST pkg-config-1.3.9.gem 22016 BLAKE2B bb22881e07a251722e5e2344a8ebfea105456c4994da01b6cad53b93c5fab515537c04166be9985bac224944e89506040a2f89886f03c9f5d9c2227551e6e840 SHA512 ffec47956f59daea7eefe749474389cc43b500251b7d35cf268caed975d4b8483990c6c5cc0eb1cb918a7e09edd483fe88d6e7141c13496edeb4d4aac5ab3019
-DIST pkg-config-1.4.0.gem 22016 BLAKE2B a9f56e68580b290bc0b09b07dc059b5ac7141a97a2a4653529fd59aa348bee7ce90a2e752172d2d0f376b67fbb7253f0d3bb38107eb68e3d6bb3f7d57637423c SHA512 d60539519e86e210def73d2536a694e2fc7a6a424c7cdd49b6046420b113520465e1863ef4d90d9491d081b78e16cfff27121d3b7f78a78330c4a242c652ebd7
 DIST pkg-config-1.4.1.gem 22016 BLAKE2B efac610221b288bb669a3783c0e70af3951478147896315c53af2186912b60045096c0ba01a0a59ce09897a2e4e747d28a091b947281fe7f6dd6f85cea31aae7 SHA512 72d61466c1ea53a5eda66a8e8f8106fef0269fefdd349ac83959a34bb8f36796bd3e9c7fbcbad5763d2fca015c65436f9d410724e27b6d1c495e3957d26757a6
 EBUILD pkg-config-1.2.8.ebuild 808 BLAKE2B e966ce51b3bf4b5504b76194a6f75d293d50ac23d1c3538ecac2b37261074b798ec3eb6b2d2af73d87b2925f8be35f979373113b673d1c2a917a59ecf213d214 SHA512 2d5631b30ce63bb2273be43b50f0de5cf23f0a6a1f26ba13fc250118b37643a3bb6269155a02d498da6e4cae898829c27b8a2a2ab94e909d9a6c6d7c99df4194
-EBUILD pkg-config-1.3.9.ebuild 782 BLAKE2B 09b12821679056cc353d2237646e0ac1d7133911b7feb807f98475a089bcbace94cc369c64b358ea259fec05a1b0a8fb1ea5ce74c243d7f310cf2d43cbb6bf57 SHA512 f966f493d6970414584d54bf67f3639d32f9e77d59e8c3458767c5fe5b657b37aedf8ad8395a3450f8012a498be0f6284d238409175598d519401304482c5e45
-EBUILD pkg-config-1.4.0.ebuild 789 BLAKE2B d82c16b185475b8ce6447f698ac5631671707f619684b86d71a5f3228526212e87513ff26a7c5c1dda7af309904bb2845a5c74a983fbe591335771bb4311dfca SHA512 ce0b176b3412a1e7aff971173e6e9188a680391e57c2f6e52444589ced6b5ec0f2dd7b671b65b8c172c9473e5df973b04b86bc347411e2185fd651b9d869b97e
 EBUILD pkg-config-1.4.1.ebuild 789 BLAKE2B 5a714663ab7b6b4cd8d74ec0743a8ecbd230bf399621b08837d00f1ed688de0f24e88ecdf580bfb08009b00c06ac95988d8a26f799af7ad0ca725d2479918a11 SHA512 277cf13c45c85bf5269f6b0a6557de852cdd0b2510d276e6187d04b554d5c1974b40976e2805f376568a3e869709d68f04ff9195a9a0f30fc5a0049b171b3f17
 MISC metadata.xml 424 BLAKE2B f3283c73952daca20d85a5421afb67150aae553faa03d653686718ca5216c1a65ab5983fb669cc34003902b0a969275bd22e4d1765f3896c7e25bee301323f42 SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5
diff --git a/dev-ruby/pkg-config/pkg-config-1.3.9.ebuild b/dev-ruby/pkg-config/pkg-config-1.3.9.ebuild
deleted file mode 100644
index 7b976ed5ff60..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.3.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/rcairo/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-all_ruby_prepare() {
-	# drop failing tests
-	sed -i -e "/test_cflags/,/end/d"\
-		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die
-}
diff --git a/dev-ruby/pkg-config/pkg-config-1.4.0.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.0.ebuild
deleted file mode 100644
index 982645a27694..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/rcairo/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-all_ruby_prepare() {
-	# drop failing tests
-	sed -i -e "/test_cflags/,/end/d"\
-		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die
-}
diff --git a/dev-ruby/postgres_ext/Manifest b/dev-ruby/postgres_ext/Manifest
deleted file mode 100644
index 239b00d97fd0..000000000000
--- a/dev-ruby/postgres_ext/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST postgres_ext-3.0.1.gem 24064 BLAKE2B 013a5b146474006f5bf15c5336b84b279a2d92afa632faa8e2c237f02bd4d899fb7ce7f7bda401df7b686ee7e952248db1278aeced9067a15343d13f5a5f832d SHA512 da1f47e90e12229f675955491d21eea56a349213db963e7a6e29886c1f5b8773a1988ca224be4abf5163e66e4189d98e9adf85d61e201488e5c13b36bc6f7b4f
-EBUILD postgres_ext-3.0.1.ebuild 1448 BLAKE2B 2bbe5af5da1795110bd86680e39e08959bb49c52e74ed75f53bd4e6d251e4161a7d2cd7539fe00098981fa843b3180007fa62133ade6e6be1cf71fab52fdca2d SHA512 9230f904c8d967cb6a084e7f177ed3fc45be38ea96d05029f9642bf3280b2f00dee5de6e80b9c3c99d63e11f22b89c2f051bcedae1b50bf2d12d2aeeb48b8531
-MISC metadata.xml 343 BLAKE2B d0e9097262d31b024b2c77f30e35d4d905b6dc9477f670e00d34bc7e60f54a5df408280bc65e168d4b9d0b37ef0e4f479aa485762d14952f7c13a2740548aa13 SHA512 b00bbf491b1dca98cdcbdd8a23982a5120205f07e9948c453c9c18ae3233e450cda7d6e78986b4a1b6ae17db15307ef9494be4e85aca31b453e3531ff0de060e
diff --git a/dev-ruby/postgres_ext/metadata.xml b/dev-ruby/postgres_ext/metadata.xml
deleted file mode 100644
index 3d9ac2a2fc57..000000000000
--- a/dev-ruby/postgres_ext/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">dockyard/postgres_ext</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/postgres_ext/postgres_ext-3.0.1.ebuild b/dev-ruby/postgres_ext/postgres_ext-3.0.1.ebuild
deleted file mode 100644
index 907385a5ddb1..000000000000
--- a/dev-ruby/postgres_ext/postgres_ext-3.0.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Native PostgreSQL data types and querying extensions for ActiveRecord and Arel"
-HOMEPAGE="https://github.com/dockyard/postgres_ext"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-# Requires live database connection
-RESTRICT=test
-
-ruby_add_rdepend "
-		dev-ruby/activerecord:4.2
-		>=dev-ruby/arel-4.0.1:*
-		dev-ruby/pg_array_parser:0.0.9"
-
-ruby_add_bdepend "dev-ruby/bundler"
-
-all_ruby_prepare() {
-	[ -f Gemfile.lock ] && rm Gemfile.lock
-	#if ! use development; then
-		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
-		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
-		sed -i -e "/gem.add_development_dependency/d" "${PN}".gemspec || die
-	#fi
-	#if ! use test; then
-		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
-	#fi
-	#if ! use test && ! use development; then
-		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
-	#fi
-		#https://github.com/dockyard/postgres_ext/issues/166
-		#ugh, thanks
-		sed -i -e "/byebug/d" Gemfile || die
-		sed -i -e "/fivemat/d" Gemfile || die
-}
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]; then
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
diff --git a/dev-ruby/protected_attributes/Manifest b/dev-ruby/protected_attributes/Manifest
deleted file mode 100644
index 6efcd89b7be2..000000000000
--- a/dev-ruby/protected_attributes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST protected_attributes-1.1.4.tar.gz 23562 BLAKE2B 8b8c8a9f533344c6344de0e389807e39c06f53948d9206f965d0f954a9e8e8f4de61aebcbf96d95186b94e600ceceb48fd258087dfcc3baf15e65d588569829f SHA512 02c55825ec21dde386e31b25e71df4ac48c2356bad303a82cc33703b930c5f8e36b57193761dba59dff3868d39a3b5458fb2a2c49809019e72ed4b4f4313bed3
-EBUILD protected_attributes-1.1.4.ebuild 844 BLAKE2B 64ff73c83137b601f79425eaf6c6a32b71b8fc28b888cc3c1b23513aed8f2d5b3ed8bb50d53b524ddc7f2f115d1c5c66e91e20e42e597377c49b2ed2871b0352 SHA512 8491823b564d816be8f745f472e616399ffd723df1a044d0e48a8b63abe2e1cb4537c6735546af068bf2f4917dabf4787966fb162bb06f8503484c5d0a67dab9
-MISC metadata.xml 352 BLAKE2B c790bc4e8d646e1d3f14c8828332433d544d0b51331a3e42701679fd7796341bcd29c1d255916611ecde2ebf63d508c2a8494d2e9a46a99938f2c247d8bd0d74 SHA512 ec61fe67997d2f82c23e5746c2e1dc2176beb97b672d9d6ebfc68922e174f00c2a5867a7127feec9c65c7d93fbc8a3e167d7e574627ca6090b0cca5f5df26b4d
diff --git a/dev-ruby/protected_attributes/metadata.xml b/dev-ruby/protected_attributes/metadata.xml
deleted file mode 100644
index 242f40c6e3a2..000000000000
--- a/dev-ruby/protected_attributes/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rails/protected_attributes</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/protected_attributes/protected_attributes-1.1.4.ebuild b/dev-ruby/protected_attributes/protected_attributes-1.1.4.ebuild
deleted file mode 100644
index e23b1df20ff0..000000000000
--- a/dev-ruby/protected_attributes/protected_attributes-1.1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protect attributes from mass-assignment in ActiveRecord models"
-HOMEPAGE="https://github.com/rails/protected_attributes"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SLOT="1"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "
-	=dev-ruby/activemodel-4*:* >=dev-ruby/activemodel-4.0.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	=dev-ruby/actionpack-4*
-	=dev-ruby/activerecord-4*
-	=dev-ruby/rails-4*
-	dev-ruby/mocha
-	dev-ruby/sqlite3
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/github/ s:^:#:' Gemfile || die
-}
diff --git a/dev-ruby/pry/Manifest b/dev-ruby/pry/Manifest
index 2690d9ecd622..516a299709a4 100644
--- a/dev-ruby/pry/Manifest
+++ b/dev-ruby/pry/Manifest
@@ -1,3 +1,5 @@
 DIST pry-0.12.2.tar.gz 237824 BLAKE2B 2a99e6092968150f2c685bc93004bd596adbe5e289bd52ee68f11b52512ac43d0e7079b8129445160652c668c355edae97f1fd0fd2ead940f769831ac9ecf4ff SHA512 b3a2a9a26d7062b994760fc5ca6c8b477813e215624d88ae56d23703429d3d8d21357b5d89583c1af1c7654f892c0c57ffbc6dd6b6f126e0a6b786c7c48df6af
+DIST pry-0.13.1.tar.gz 240103 BLAKE2B da4797e36aecba8bf1a785738339ed4be1e06ab28b329b66551a908898cd0515fc0da2434ba96e9fa0f350c9d32c13f850660bc0236c6c0218a4bd3182ec4ced SHA512 bec52c75dce365db68504634b2eaf6b0f312527031401199fcdbaa3ec5a9272148239d93305f8e66c4d36513f9fec3fe045e978c5a10f012a2880ab4a16b7e85
 EBUILD pry-0.12.2.ebuild 1174 BLAKE2B 310ef1595b60ca4c27b1bf88a05f3e4b6594df525800d91c2c50b1c792e3dc96115eebb61869050c77e5aef0c24702f3926f23220306d2205db02e7d6114cd47 SHA512 12a816551686be05c853219dd1ae89d30bf231623c0a3553999802c68ffb1d4144e98895e10fb4235b3b39f2d411e72afd0d0cc7f41b3c805e389debc10ee21c
+EBUILD pry-0.13.1.ebuild 1241 BLAKE2B 5f69bbe4e681d3abab4773152098e62ba8bd8d89579322cf1f59d4b040a8ce1f370f75607a5329f2e382d065962d24768ce7a58aeda0b51b8dc18a807aa4ad2f SHA512 f610cccd1b330854c8444a44b6a5361b4ef2501183c4d42b5aef5e22ffa8ddbf2525fafefb9ef67067e7073330b6e2d340854a55d77645f3897687a36e75387d
 MISC metadata.xml 333 BLAKE2B 0c32ac9d2cb59e7aa1dfca56e88a2a38b783bdb2779c9336eca40d06770f02252442afb3372c1a786bc491693548c145079b3aa8e61fefeb0b81209f0afe3fa5 SHA512 4bd968aba7e36044799dfb4abba1a0127c4aa4ccb4e7d1830dafbf27c6c9e94fcc29ad008dc527cf2c409c8308dee14f803946afbf716bc22d9d3f716b951887
diff --git a/dev-ruby/pry/pry-0.13.1.ebuild b/dev-ruby/pry/pry-0.13.1.ebuild
new file mode 100644
index 000000000000..4b735fec0735
--- /dev/null
+++ b/dev-ruby/pry/pry-0.13.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="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pry is a powerful alternative to the standard IRB shell for Ruby"
+HOMEPAGE="https://github.com/pry/pry/wiki"
+SRC_URI="https://github.com/pry/pry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+SLOT="ruby19"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
+	=dev-ruby/method_source-1*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/open4-1.3
+		>=dev-ruby/rake-0.9
+		>=dev-ruby/mocha-1.0
+	)"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on git.
+	# Loosen coderay dependency.
+	sed -e '/git ls-files/d' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e '/[Bb]undler/d' -i spec/spec_helper.rb || die
+
+	# Skip integration tests because they depend to much on specifics of the environment.
+	rm -f spec/integration/* || die
+	sed -i -e '/loads files through repl and exits/askip "depends on parent directory"' spec/cli_spec.rb || die
+}
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index a4dbbf2086d9..54bba93225db 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,7 +1,9 @@
 DIST public_suffix-3.1.1.gem 99840 BLAKE2B ef86b7ecb834a855dbb44b8a0f934de3715edb6d67faefd20f99054898b35bfedffd490b60fbe80236905826868611aa96e13766577bb98ab997321cf9c49b39 SHA512 1e266ed7fa224fa94a49a51dae2868bdadb80ca2de660d2cda9a1e146ccad5aaba2cf68d75272e333a4b1a80e47863d388d85d3a86bddf8f649a320e5e700078
 DIST public_suffix-4.0.3.gem 105472 BLAKE2B 5654fb2323161eb04fe6e30194593fc521148e181a112378c8214fa6980d0edeb0d03e7745333b1cdc55d0f5251f811e1e6707b77b94613b6f199048d6d91ffc SHA512 9c4f6fb0a1a8ea4ceb3203bb0d9c53eda4b0779a6e25b4a6d4236d1cea62f39bbdedc50cb9808492fb54f453311b37548a2a8e0ac3ec83777876a9b6aa279ef5
 DIST public_suffix-4.0.4.gem 105472 BLAKE2B c6be420744976bb3c5dd78b4ab4fc4d4293de1a985af95b288520983957a11224c2548ca7d34009d9ac1fa975880d7971a9a7d6267634cb97836ce0486d62a03 SHA512 d6f61d1d1756541a84a4745d02732c769901c0d309ed15c48ef01b153ba7c2a801b227251e02a8a5d85da2ffd0c52888c154ee374fc54a6aabe385b398144696
+DIST public_suffix-4.0.5.gem 106496 BLAKE2B 1b581b2d08e78b156d70f25d1af66f825f7e1e332049311001f4d20982222fea463e4eb79ae12152c51269ee42c883cd966f479225f26c01b8e7a70f870d5ddf SHA512 5de30466e27d853c498f210dbe168c52d0e5efab5b6388c88de5667e40dee151041d6a1a9203780230dfa03bd2fb920a50b1301d05d12a31f4d31f8352218821
 EBUILD public_suffix-3.1.1.ebuild 831 BLAKE2B 968e319d13936e42e934d505804b591c04326570af9c782bee4f69f95d11b0dcd5851bf499998e5beff5f00b57ccfaf2e890257ec82d0154847abad72adb2a28 SHA512 17f9bdf7fc3b2e7a4a2f120de1edde11160529cabb3037e793b3161c7b0b26da38526c2b63307fe7f9303998edb8ca8e40adf3bb7883fcaec7771ac2a5d64075
 EBUILD public_suffix-4.0.3.ebuild 840 BLAKE2B cb88c1708000b2a28694a6e33ba608d7e45aca4fcef28286dd914a6ff6061ee27f97fdd85ee593e1ffd6cc538e635f1e9b02953085fa9515eaeb0e8376062a14 SHA512 1810d10f0bfe95c05f33f3bab26d6786582f771768d022be8691ed240b353218a4899a896e447f9745dfb21ee8d3a433cdd9fa805abacc4ac38d1f1819d8718e
 EBUILD public_suffix-4.0.4.ebuild 809 BLAKE2B 27f2e497bab530739771803993bfc43d58659e074caf86f9be0182ce8f4c155db29f332e3791d639ce3eda471804f0f0f3fa0e67423f4fc7611d0961120e8145 SHA512 0c75464ad694581748d6dba689773d24ee41de43710d47bd35a64f0794777c3bc755bc9c942586b0035404cf3975d8008cb902660d6a624e5f7ea197606cc4e6
+EBUILD public_suffix-4.0.5.ebuild 820 BLAKE2B 37a13eff7a950424858cf7daea0f614369326cae62fdbd80f14d0b314ec1641d4263b9f414ce9f31b929d67f771e372b63cfdeb0307ec35c628e2b9b46b20c9a SHA512 6f328162c2a0f96c9e7a57ecabf7ee28ef82a7fca9331b9e94c92ec8b5f49d627a298a98f08aa10dc6294e71d1932d2d968aeeda6912c7d31033ba0e426c4cd1
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.5.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.5.ebuild
new file mode 100644
index 000000000000..67e0089c6b13
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-4.0.5.ebuild
@@ -0,0 +1,29 @@
+# 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_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/rubocop/I s:^:#:' \
+		-e '/yardoc/,/CLOBBER.include/ s:^:#:' \
+		-e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/pundit/Manifest b/dev-ruby/pundit/Manifest
index 8a7e0cc0fe3f..f97a812f28ee 100644
--- a/dev-ruby/pundit/Manifest
+++ b/dev-ruby/pundit/Manifest
@@ -1,5 +1,5 @@
 DIST pundit-1.1.0.gem 22016 BLAKE2B 912f359cb4530c4f65622c3a7bee48a7d84757e4c8327398dbb4e4e170a35f4811c018224aac752b6c2ae54bc93e65b5e0b46f0bb191da57355b55ea0e8d0eaa SHA512 ea7e8ef9e4b280f451810ba193dc5b27a75ecfb050eed674246034ebb687e8302aee8826c022090553b643b41c85adec4d3234f545ab2a59ececa461fe4e4b3a
 DIST pundit-2.1.0.gem 25600 BLAKE2B f8284e326a68475fe4c733de85597ba91e376d37e5dd24d97c1a8da2ab7f15d2cf35cf76688370f1a96c00f8ce89df2d2bb6b3c6de1ae33d6cdfe1ffd1926e3f SHA512 3201cb3acca8301a0e07fa9bd58617ee32074842e873a85a31d9b56fac5bd93c4a78d94d8b57556a011f1713712eb484ef3281d68ae3acf1c8bf1bce13f47e0c
 EBUILD pundit-1.1.0.ebuild 641 BLAKE2B b1f8b9547eb2ec66ebc01ea235b974d70305c8b7424179287a3b007a98f14bdf3c23ba5427c0f41d9d604b030ac50f63ae179c1958d8d44d39afc0552b5e9e93 SHA512 ed6cdac782cc6ad1a4f07213aaa2ad7918c02938db584fd8786632164af4ddafc938196892f56095e305a0eabd351f61bda53fc9b7626ea6e43a54d27a2aba56
-EBUILD pundit-2.1.0.ebuild 608 BLAKE2B 001bf0bf04c35903eb4fe5be88bbee9c04b173bc756797d3abe8967364a96e8732b0d03ae6c40597cf71e44ce934f722a3c1bf83dde9a737e679e32f7b5ee3da SHA512 37b89fb6892495aedbddb7bd02712bf3970c2b794791bff97b9d3056331cd21ab825dfde433cdf293d53198be655269f916b5f84ff51e2bade267b04b2c8400c
+EBUILD pundit-2.1.0.ebuild 615 BLAKE2B 7ec237b656df019d8d2265381a63f546331fcc5edf38744ac888f8b2c39cc54145f56396c35c8aa10aca7d5c57ac73b975a36420a1a14d91422522df73385ff9 SHA512 83ae21c8d5c5704cbf8020947d718eeb97686e4b970dd497a4797131be183a4714be773856cd2b9fd541b306039f1f0016d24f6a27ecbc4e2636a80dee651cdf
 MISC metadata.xml 376 BLAKE2B 2cd1d4cac40c14c7228ed06fba336f89c6b3e5f5111cc59187ecf3a050a08cd0e77c9b1c5d805374deebcad84f835e52f052dd751481e17c84b59d6dbdac08b2 SHA512 3f0ec90029dbed0d31321b37f959b6a099e73d4d0604bddd2a1fdcf4509a36252cbf0b591aaef793392dad4125440cfdbe807a213200075310223c44c485ec9b
diff --git a/dev-ruby/pundit/pundit-2.1.0.ebuild b/dev-ruby/pundit/pundit-2.1.0.ebuild
index 494728cf157b..dc228494dd9b 100644
--- a/dev-ruby/pundit/pundit-2.1.0.ebuild
+++ b/dev-ruby/pundit/pundit-2.1.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=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 093b18492732..dc5d1bf437c9 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,3 +1,5 @@
+DIST puppetdb-termini_6.10.0-1stretch_all.deb 21294 BLAKE2B dfe88c6a44eed3e8a0826fde8f6130d3d817acafa367415956587e44298c99c41fd7bdac709c1ab55dcc9dce165d2599a2f18f0e1fd058d717128c0dd3a6ae28 SHA512 da7bf41e43acc39a44655e4759a14c119e6c1665c01a8b0ad4d83767c65068e071fc8ff6af80810a20cf92508c55c9ccfa295e197c0f7c94ee70110ea4515aae
 DIST puppetdb-termini_6.9.1-1stretch_all.deb 21294 BLAKE2B 579181f4404e5b9dfbc444364c58402135ea68bef0fd3bff894976ee04f7d181699d2456d5ee6105707b765ee1842fac38af7e97f07621436164d79ff8c32a35 SHA512 62d3ac5b922eb3b3ba50f47a104dfb04ca8f3284b2474ed45cf609b21696fa01fa2eaecaa1c94d7b50ac22e8b187b4efc8e43d3cb7d66bf02554b1c03996b040
+EBUILD puppetdb-termini-6.10.0.ebuild 665 BLAKE2B 611933cbf3ad90f8e6f11c4b3460d9946519c30ff57b0132d0de9cfab7d243365ab4a3deb10643df19b79cb2bbef878347614e3798544f2494e75f786d8e934b SHA512 613eee0dfa30b09fe2659dd2775d8f1c0f334d5304d153d7965342c0dc610f1402b6e34b60078078d852d031e2b67cc8ef59d952c266caf10bda6dfa5eaa2603
 EBUILD puppetdb-termini-6.9.1.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.10.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.10.0.ebuild
new file mode 100644
index 000000000000..a7f2b53b2dde
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.10.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-ruby/racc/Manifest b/dev-ruby/racc/Manifest
index 837ea4daa219..671213509deb 100644
--- a/dev-ruby/racc/Manifest
+++ b/dev-ruby/racc/Manifest
@@ -1,5 +1,5 @@
 DIST racc-1.4.14.gem 116224 BLAKE2B 67abd0e9bed46d7c589c62426943c8594d3b119328cd08576247727b11beb9e32ea45c54d0aadefc26691972fc40aad1b009c55bcd90a5b89aaf37e37a1097c1 SHA512 7401ad1722c92101c24f881226e44bd8b21033c7bae8b13cbf329f9b426c312ce61d14ce584b4f94d6863b77f30d6ebccf26f9fca2de724f8e0659f0e2d2173f
 DIST racc-1.4.16.tar.gz 451711 BLAKE2B d3bcb72a69df255d5468054541c281bf7bd3225eb3ba1997fccd6dcd219d3a8890e3df7b43fe106ffa3fc63a8d8079cab83e7096b0737f5bbacf816b7c3bbfb2 SHA512 7cdf6a62449e8f39984a8b27706045e509828a93a72d112b22a4c467184a63ee23b4b2048ef7017846053fb2ff4021aa43d96a6147fa271257df584ab3d66f38
-EBUILD racc-1.4.14.ebuild 1797 BLAKE2B e293ae8c9af0fe604039fbcd256efc98eb08c7a4b5c525d47f812a541053dc8e70bea58a223bea9239f15723d915a8da8cf08970caaf4fa53f6615952ec2a107 SHA512 d3f2745bb42643e74d8c9d14e9f6f018d83a8dddbcbd4d264761a74e2135efa8ad8509c6ec0d231caa7a7b0bd96965ea156981f637cc4f7de8636d7cbd68c20d
-EBUILD racc-1.4.16-r1.ebuild 1903 BLAKE2B 233faf617b75610dafb2ec5696983112dc5795586fb3eff6802527ed28b8c9112353664fe60f8810916213a5803b11d6deab129dc8b98c20f2e33c3e0727d5de SHA512 3432cb8ab221056fea5c852dfa357f9ae066342c08059d1a28994cf0895ab9df03d45802d106faeb4149e6c526c5e29b9697a8cc3fe3ea06d4f196d9972355d5
+EBUILD racc-1.4.14.ebuild 1834 BLAKE2B db2b7502c1b78849f4a869a59e57a03aa77c6822b71655c983034a36c6e7aec1a1838ca08d0458870e305b0c5082348936f0055be8fbc06cff511a8069cdabeb SHA512 3b73e83f9441a3fc7f6974c2bbf7fed996bada375f8c73ae48c18492191a9725f65927eaaf7c601ece330c2e3cfe50d608e399120edab7cd079733f3e22165ce
+EBUILD racc-1.4.16-r1.ebuild 1940 BLAKE2B e7b94991196922c0db8e15ca7d54d9bee6a3d429c16c4a5e8a2a9ced4a2b5794e26e7b46f5ecb60ea090b0dd398f4e3eea070fa8e1c80a7be9e9b4ffa0c49517 SHA512 aa517d186b326cedfb265f994fd2d47087a9af0ef3c800df30a94c11891538a9c67f4714b91ad4f320e25e701bf2ee65be214d276f93c8bdfbce3ac5080512ac
 MISC metadata.xml 331 BLAKE2B 67dac6bbbf2927c5fa694a0de98635c952eab8ceffa913aac7762c88625957b83f7bbeb22dbab5adb445b306e7bb5efed458e23b9a2c8137e65c36b4d12744fa SHA512 cf609ee98391504a83037f2fb2601b7b4f5dcb3ce58be9dfb895b8b961ed54e19d9782979cf24f1c1187087c1a8482e755d24abec089187870dd6361f17559b1
diff --git a/dev-ruby/racc/racc-1.4.14.ebuild b/dev-ruby/racc/racc-1.4.14.ebuild
index 5ae06002a66a..4688ee338444 100644
--- a/dev-ruby/racc/racc-1.4.14.ebuild
+++ b/dev-ruby/racc/racc-1.4.14.ebuild
@@ -20,6 +20,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
+ruby_add_rdepend "virtual/ruby-ssl"
+
 ruby_add_bdepend "dev-ruby/rake
 	test? ( >=dev-ruby/minitest-4.0:0 )"
 
diff --git a/dev-ruby/racc/racc-1.4.16-r1.ebuild b/dev-ruby/racc/racc-1.4.16-r1.ebuild
index b1180f7dcb83..c3dff6698030 100644
--- a/dev-ruby/racc/racc-1.4.16-r1.ebuild
+++ b/dev-ruby/racc/racc-1.4.16-r1.ebuild
@@ -22,6 +22,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 
+ruby_add_rdepend "virtual/ruby-ssl"
+
 ruby_add_bdepend "dev-ruby/rake
 	test? ( dev-ruby/minitest )"
 
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index 6a442f154948..3c2a59adeef0 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,9 +1,5 @@
 DIST rack-attack-5.4.2.gem 23040 BLAKE2B 7af950339f03139e6a3ac9e8349e6d2af5182a29f643a08a9ea0806349c02965d05e99d95421f14ba827c9c942a6824f710dbaf06adbb0aa07dde03d74e629ed SHA512 a4af12c2c436a3634108494e2a5b9c5751c0fa2e87af6efa326d9c09fdae54b5bd8a8974c48785dfef64565ff9ee0a6704c90acf1277c8e80849ff30f9fbb67b
-DIST rack-attack-6.2.0.gem 24576 BLAKE2B 7836dd0c8a56bfa6337cc0bfa8ec2a4224873108d73bf1cb225c07a7720fba239bc7eeb75467c098c890050338f60420874c27529568b93c3bec9ed04926300a SHA512 df5de90d976dbd357780a5ab4a012ea1e528e5b608bad57ab8c59ee39ad36a1cf4490b3ec663d7f8ca6b788118ae7b256feb1cc475f8644c29883080e9c8b9dd
-DIST rack-attack-6.2.1.gem 24576 BLAKE2B 4a40486a457b5568045b4311a8eb1f4c54f2e04f68c92a643f4e6523ad32aed6253ce4faa830f0fe36d21ae89137908aab90cb07fe1f1f7307d4ac486de00263 SHA512 aefc9f2b56f5345e45f90b2a90619922fbc4459e95db5b324a58ce05d15b749f5fe93033fb5b7a8e312c10cd076a3e47033ff34a71712ec2923158cecfbcd0c7
 DIST rack-attack-6.2.2.gem 24064 BLAKE2B dd76a1f76b4f20e8bf01ac4bfda9af2daacbe972f7847399bd30b9472c8e0f66dbcc333b19eb2e482f91c38d9557ad76559b6a40b7f842faea43b7f88e24cd77 SHA512 c2e852f0871502d1f70be20e6d3d6a9ffe50e6203950624b7ea4f6f0c4c48239a8dbef417f6b7348146f3f6d5a028bffa133c29da6453eff57438d7993562822
 EBUILD rack-attack-5.4.2.ebuild 924 BLAKE2B 9bea5a9f9f54b9a6f54b17c2d0dfb84546c54b95ae9c994152a5f56440e3d3a0725e43c5c28d8a08bb6075fe7ccabfd38c96146c885e9c53572a3364262dee37 SHA512 4462b6e58fe4beab95ea2fc9b4468180877e77dfd664a25140725de53397ed04d4252a6b71fe2c8b86f5a66d5eb43bf7c5958ae6bdc5e5e0443c430b96d2840b
-EBUILD rack-attack-6.2.0.ebuild 893 BLAKE2B cd8bef8cd84821901751f7c4f8d4fc9b8182091f76861822b4dbde0768cd0b358172d59ed4542325f403112dc9e6495810455f30775890f93a54b407afd94f47 SHA512 65dff2e0e494a4c07930b936bc2f8bdc9bedb13f37a07cc529f02d1507119c42847b977f5cbcc7d94bdd291ca997130cd82cf3dbd0a38e753f6c8119e718d355
-EBUILD rack-attack-6.2.1.ebuild 893 BLAKE2B cd8bef8cd84821901751f7c4f8d4fc9b8182091f76861822b4dbde0768cd0b358172d59ed4542325f403112dc9e6495810455f30775890f93a54b407afd94f47 SHA512 65dff2e0e494a4c07930b936bc2f8bdc9bedb13f37a07cc529f02d1507119c42847b977f5cbcc7d94bdd291ca997130cd82cf3dbd0a38e753f6c8119e718d355
 EBUILD rack-attack-6.2.2.ebuild 893 BLAKE2B cd8bef8cd84821901751f7c4f8d4fc9b8182091f76861822b4dbde0768cd0b358172d59ed4542325f403112dc9e6495810455f30775890f93a54b407afd94f47 SHA512 65dff2e0e494a4c07930b936bc2f8bdc9bedb13f37a07cc529f02d1507119c42847b977f5cbcc7d94bdd291ca997130cd82cf3dbd0a38e753f6c8119e718d355
 MISC metadata.xml 349 BLAKE2B 5e0852caf34767613f144f3a6680223198c6cad55b7ea30d0778d788ce2293a2586bf0edc698dc0a5edc11d4e1d408576ce9d7c1eb3602e7fe7f10e2be33c1ba SHA512 9584ab20de3f1604d81e9be1baa8b4e355e5a43fba3a0cfc43a3d4f5e67df0d089a906b479b99150f76e54d07310d650ae96171d6ddeb8e3f00a446e2a95a795
diff --git a/dev-ruby/rack-attack/rack-attack-6.2.0.ebuild b/dev-ruby/rack-attack/rack-attack-6.2.0.ebuild
deleted file mode 100644
index 3c7630016e9d..000000000000
--- a/dev-ruby/rack-attack/rack-attack-6.2.0.ebuild
+++ /dev/null
@@ -1,36 +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"
-
-# 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="6"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? (
-	dev-ruby/actionpack
-	dev-ruby/activesupport
-	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
-}
diff --git a/dev-ruby/rack-attack/rack-attack-6.2.1.ebuild b/dev-ruby/rack-attack/rack-attack-6.2.1.ebuild
deleted file mode 100644
index 3c7630016e9d..000000000000
--- a/dev-ruby/rack-attack/rack-attack-6.2.1.ebuild
+++ /dev/null
@@ -1,36 +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"
-
-# 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="6"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? (
-	dev-ruby/actionpack
-	dev-ruby/activesupport
-	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
-}
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index 347dd541797e..246416c8d1d1 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -4,6 +4,6 @@ DIST rack-cache-1.11.1.tar.gz 261844 BLAKE2B 3fa067ecab4ce3fb52f678c79c2b74990be
 DIST rack-cache-1.9.0.tar.gz 260825 BLAKE2B 58f3bfbf6af9c515ef1dc7406c6b41ba8ce37c3cc9533a21f0480565fa72b72acb517a161a7d00bfd21e1e2b2379ab85796e507fe478c601c287031a70858bff SHA512 da998796a26338af2a484a8bb87f152706f33de719cc546f7bd4c4222ca5c52297d0b4dbe233e4362d6b5e6fedb7b527ce9a29cc03a6fbeee12e760afc070a93
 EBUILD rack-cache-1.10.0.ebuild 1328 BLAKE2B 1eea8a30a19c160f0e453ffe44bb15af5d19cc78887780bcb74b60d80ad975039afa0b749ca46d21052d88d3ed58a8259f0e89f195b7168f9df497a2adec977e SHA512 8b2ca3b3ea35b928983ce6ba404210278136fa103282ec5b34a728c7190ce54e255ced685f9ae2fefe7e5e01e3ae31fa45923a0592d567d81fa91bbac05d05ff
 EBUILD rack-cache-1.11.0.ebuild 1328 BLAKE2B 1eea8a30a19c160f0e453ffe44bb15af5d19cc78887780bcb74b60d80ad975039afa0b749ca46d21052d88d3ed58a8259f0e89f195b7168f9df497a2adec977e SHA512 8b2ca3b3ea35b928983ce6ba404210278136fa103282ec5b34a728c7190ce54e255ced685f9ae2fefe7e5e01e3ae31fa45923a0592d567d81fa91bbac05d05ff
-EBUILD rack-cache-1.11.1.ebuild 1328 BLAKE2B 1eea8a30a19c160f0e453ffe44bb15af5d19cc78887780bcb74b60d80ad975039afa0b749ca46d21052d88d3ed58a8259f0e89f195b7168f9df497a2adec977e SHA512 8b2ca3b3ea35b928983ce6ba404210278136fa103282ec5b34a728c7190ce54e255ced685f9ae2fefe7e5e01e3ae31fa45923a0592d567d81fa91bbac05d05ff
+EBUILD rack-cache-1.11.1.ebuild 1335 BLAKE2B 784378af2d37693f0b002c019032ad617b4e02224c61cf96826ad01baa99792e4e6ccf1e554698fe5787987886d6ffe41a99f6c005b7f3ac6fae7075ccc6c34e SHA512 b78f2a9d1b60d7898defa21c628701a1c8e6485eb06bc9b908a42817ed611a4440a2af0c39f984d93760597b542f405d43965f00e940e01396a001bcc499207c
 EBUILD rack-cache-1.9.0.ebuild 1137 BLAKE2B ef087065bd4fa71e16693f140595b6bc13de4d7f50e3eddadcb82990c11385b7f662cfe7a7f710b1a8370b7f6a7c6f28529459c894579e96bf67c478a003fdfb SHA512 7b23ae99df34a1b1f2b9ccecbdd2955bd56869b227c1fe299703f0ad56a68a1058b86aebf94e0a8dbde373326416da8041977f333f9c4e0c1d4b29713e0be307
 MISC metadata.xml 335 BLAKE2B d6f5130ac567d01cf6c3d831149be70ffc68d04d1b115473e6e8a550f392dd82341d72d9ba813dfd33cfa4bb5453ead5506ae75ae6f80cb9f47623e631e7c997 SHA512 3763e8653d06f4f62a253bd075ff31273fdc39edafdd74838c8fe65bee42a9bdfede99c01f236218baf496b910f5aef722ee3d5ff39d26c901e30df1406ecfa0
diff --git a/dev-ruby/rack-cache/rack-cache-1.11.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.11.1.ebuild
index 432b873f8e33..3a46ea6f7c4b 100644
--- a/dev-ruby/rack-cache/rack-cache-1.11.1.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.11.1.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"
 
 # no documentation is generable, it needs hanna, which is broken
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/rack-openid/Manifest b/dev-ruby/rack-openid/Manifest
index b0f4b7a32713..1c336cca99e4 100644
--- a/dev-ruby/rack-openid/Manifest
+++ b/dev-ruby/rack-openid/Manifest
@@ -1,3 +1,3 @@
 DIST rack-openid-1.4.2.tar.gz 9444 BLAKE2B 0aa675ff4b6a67fe21b93d245111415f5e483f7b4a210f819a1f1eb6b242f6d75a1c182a2965a57350eb6bf2a088989c90d4b3c0348a4643a3889639759be3c0 SHA512 7b651899c7afc10d11358bd6de075f2f902c2188ce5f9d7bb6d1fb75ec77d1c53b11926ee254eead2229ac00312382540dd550debfc5fdc137e009011eadd321
-EBUILD rack-openid-1.4.2.ebuild 892 BLAKE2B 5ac90d808fb40d2745b150314e9d53b9adb61b9685af3de044a5c928aad7554047352c95238fc890c4b1e3db5ec6425c3802f46338d4bed2f2eeb3dbdd5b94c6 SHA512 93de7ddb2948a50c3b90b818942feb5d38d46b34aa7a8ffb27022adb76375c5022500b31e6a426520a96d0084d6629a81e7be7f043ee0f43e6d391e159ea9b10
+EBUILD rack-openid-1.4.2.ebuild 892 BLAKE2B b2e51f22e9d1bf4be8d29c47d91ca76226eab9f027635be7b852baae73ddf6a792058543e36ec6fbe571847aea9f4eaa2218ec62ac5c41208d5e7f71e081afdc SHA512 0656bf3bc2c1c8665104c69e0c503a85edb110259227ecc64e5780283addd06f3ee21670c769f7d9df52e78ebe709196cb04f4e35154180e14a99a804491675a
 MISC metadata.xml 345 BLAKE2B efd918bb5eaf6ed922c59cf416781fdfcad6a7ec77ef8280c769d19019f77d789ee9db60c5e2e3722fd3563c51f2a615a9ad5c6739422e2ff492f17a3afad2e5 SHA512 bca9d433271ba8324b1f0bdc704daa808f7d989b3f2838085615be87ef11a03eb1378c12674a6d8c82ec950bad70c33fdbadfde72503b3c2dd5dbfd79efd7db2
diff --git a/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild b/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
index bc00e0c81446..9428dfa1bafe 100644
--- a/dev-ruby/rack-openid/rack-openid-1.4.2.ebuild
+++ b/dev-ruby/rack-openid/rack-openid-1.4.2.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_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
diff --git a/dev-ruby/rack-test/Manifest b/dev-ruby/rack-test/Manifest
index c9f901a47269..54507a831cfb 100644
--- a/dev-ruby/rack-test/Manifest
+++ b/dev-ruby/rack-test/Manifest
@@ -1,5 +1,3 @@
-DIST rack-test-0.6.3.gem 23552 BLAKE2B d494f7fa3d2f7ed6fc6d33e507c445990613425826ec2e3d059d978b09d316ab93685aa5fd00ea89d00002ec7ec242f7fa64a42ce214fa7e9c40334d7e7a3750 SHA512 a5ad0f20130eedc153515127d2483cb1322c230ab772307943ec6eb295706f3aab26c8599cba69323b3cdc5692b284ba0609d8db957ade7085a95d94ccdf8b41
 DIST rack-test-1.1.0.tar.gz 27035 BLAKE2B 640de2303850662c3b6a8fc17f2344223c9928b48abde6d1b251a634689793158f35498c4736e4e2d069efa921d37bc32da92a7e17c0761a6f6111b345b54c1a SHA512 36d947d9b13d33ee8322e5b9d18fe8266787ccb7703f1fafadc040123e34dd44e98e7faf8b6dd816e51ed167065b2ffe79e9bcee74564dc324ba2b7dba76f82a
-EBUILD rack-test-0.6.3.ebuild 959 BLAKE2B 97f7f0ba6f376e50991dadf70c745069b295c03e0a2f139307b089d4287e9c2419d2c0e26f22b746c102efb229df4287c35db85e8020df69f8e9e5e067047fdc SHA512 732544b35298ca4b7a5124ef0ecb55a1df59ec39a4b7a60285f31744c2005156bb26243ee17bab495bd1d5887e652295bd0e6d348e05d79f128685b7e045056e
-EBUILD rack-test-1.1.0.ebuild 898 BLAKE2B d41c05860701aba1c2308fd7ef02c3434902dbaadd8dea4741f0ae1f0d968becc3022e33b5df485ba00648ea8d3e297598f47b277ce4cdf019523511f4879f7a SHA512 40393cf45c0d3f8cd0dbc14554eba9a9daf6a65fc23ccd3c311b2ebae64aa14bcb786cca17d6d940f11bbf3aaee62c19d5e8bf7bf8925122e4e1d748c01f63cf
+EBUILD rack-test-1.1.0.ebuild 1040 BLAKE2B 19f0fcb5de16001eaa104f4d6e904fd6601fb501ae9fae01d6dcb2b2e233d572f1618b9cbb8a55dc80ff87d040912ee704db4efda1c5e12f8e47d9a0175c2d9b SHA512 ad8ef2b0f65a67e9ec2702fb8d01deae15aa9a200c1b267e5496df13e833216136b9831c93abbb410aa04f84bbe774fa99e0ebf246fbedcbfe90b3e3d3514b5b
 MISC metadata.xml 343 BLAKE2B 3d64a9d71f8ea0b1af70404e282f27ba4028ccada49dd94cc54f3517a939749d1d98cf1e08c85ce1e4481971b007f88dd40b7bb9609b4879cfcceb55519f97fa SHA512 8f9aa1b7be720aa89aff9ada3782e3b7098edd7181203d78a56fd6576ff3d2cfb812557158a30353eabff9084f6cd148222f4d7cd39b7cf0073c4f9da0aacd0d
diff --git a/dev-ruby/rack-test/rack-test-0.6.3.ebuild b/dev-ruby/rack-test/rack-test-0.6.3.ebuild
deleted file mode 100644
index ee177cee78d2..000000000000
--- a/dev-ruby/rack-test/rack-test-0.6.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-# no documentation is generable, it needs hanna, which is broken
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="Rack::Test is a small, simple testing API for Rack apps"
-HOMEPAGE="https://github.com/brynary/rack-test"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-1.0:*"
-ruby_add_bdepend "
-	test? ( >=dev-ruby/sinatra-1.2.6 )"
-
-all_ruby_prepare() {
-	rm Gemfile* || die
-	sed -i -e '/bundler/d' -e '/[Cc]ode[Cc]limate/d' -e '1igem "rack", "~>1.0"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rack-test/rack-test-1.1.0.ebuild b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
index f6144b3869b6..47a50dc6c453 100644
--- a/dev-ruby/rack-test/rack-test-1.1.0.ebuild
+++ b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
@@ -20,14 +20,19 @@ SRC_URI="https://github.com/rack-test/rack-test/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rack-1.0:* <dev-ruby/rack-3:*"
 ruby_add_bdepend "
-	test? ( dev-ruby/sinatra:2 dev-ruby/rack:2.0 )"
+	test? ( dev-ruby/sinatra:2 || ( dev-ruby/rack:2.1 dev-ruby/rack:2.0 ) )"
 
 all_ruby_prepare() {
 	rm Gemfile* || die
-	sed -i -e '/bundler/d' -e '/[Cc]ode[Cc]limate/d' -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+	sed -e '/bundler/d' \
+		-e '/[Cc]ode[Cc]limate/d' \
+		-e '/simplecov/,/^end/ s:^:#:' \
+		-e '1igem "rack", "<2.2"' \
+		-i spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index c94d6d444d0b..ef4217fcbc77 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,5 +1,3 @@
-AUX rack-1.2.1-gentoo.patch 410 BLAKE2B 18246afd31b682e66a5bdd92c08bb9faed9a9fe22fade22f2c124a3a499b67794082e1bd03081c1914793003fe3c0a73b2d42f51395fc2603eb6513a3b404ece SHA512 03dba431bbdd77f87e0f26ccc6022248edbde20930254da1c55db6115dd49be5dd3f16919e15ee7baab40682b3f959b52692d5018b09ad79d4db3acb3adf6f43
-AUX rack-1.6-rewindable-ruby23.patch 1360 BLAKE2B 062c4a474959c4dce61969583b6aec1ae98acff38c1e72f5e22440c4c8938dbaa2142d70a0354948c151eede2b23ca5accadc72aeab366ca1457216d9725292a SHA512 3cb110af584cc3f767a0d3976acb66f37423559865af0726109419728ce6fbe9f484ac2340b1816ae89c1a59ca64330c1bfe4be3910bf6a8ecb05784115a1cda
 DIST rack-1.6.12.gem 230912 BLAKE2B 98a3ae6905535b284a5e723d39db7788f97c11b29506fbdb3c584c53d1dae35d1e8006724e5f63195d8407521806c53a5fcf47544b4241370a3576e6dbea0dc6 SHA512 9d0f6f44d228c1b6a7b0fbf29a1e5a2f45339b4749d563336c1729d88c3e37d6360fedde75b7cfcddcd7e051025fc50f04b594fb68d499899e96e2385478fe76
 DIST rack-2.0.8.gem 256000 BLAKE2B 30fc53abd2a9389ef00b1803d2d329b10288356fadfeaf80e0b6f7d2327b5aea058626f50d228454716007b1be0b316c6083debee98c0d0ee5eed458600f8315 SHA512 88c406cfe38c3db1a3502fc563272a99d8f2e36bfea1122cdea6b6b49b0e6b5649e1f0864161793eed83cb3d934aa260650b703bb1b059c6e56c6073c2060fb2
 DIST rack-2.0.9.gem 256512 BLAKE2B 7da7b239e5679a2f6d19626cbaf8b4ec02a7ce7ffd086732925963ac6fe0397f180548c6065abdbe8d55de802583d7dd09de38da0d4d695559456d852d2b3d4c SHA512 5b56d1aa7bcca11c631f8205605e71f9c661ec9ea7694a16f32f6fdb493cf015d184f924fdf342abebacfbb185e367c9e6dd1288ffe9dabaf4e6566b8853a191
@@ -9,7 +7,7 @@ EBUILD rack-1.6.12.ebuild 1691 BLAKE2B 27974bc4f722c22e14cab0486e18c45ea52840898
 EBUILD rack-2.0.8-r1.ebuild 1407 BLAKE2B d08baf4d02f0ef3c14f5cff37356383d5fddfb2801b78a32f7ba535f386adfce58d8a2f4542e917c6e25da75a8e653e055d9a9f24e2273120c8f5d9322d85167 SHA512 3b57cecbc78dd1b9556fd3424236d0524d21b138c8626522829f4f067c50f277eb14c980ac357383bfdb65e7c538629ce274797ce639bf714c306e31c5645f7c
 EBUILD rack-2.0.8.ebuild 1381 BLAKE2B 1cde5b2f8dea22373c7266973dda3a90b3adbb646836cab2f967aaebe6f5e1d1df6172675471d51ad5f1299367314a8f34c7e98041110f7e7e90d406b511d5a9 SHA512 8613f7540e3b1394f2d831368cdd9f47d1afa0aeb413e91faa67ec508a6ea17e3faa6f8f941005430ebc2bca7bdd68a717f35762befb83928ee7ca157dd9bb68
 EBUILD rack-2.0.9.ebuild 1414 BLAKE2B 1ca411c53bbc2e90f136249b6915a437f3a6290ffa3510a05f8403a904dbdde9e1bb085f60de01937f11773c935d08975997b8d6520d26c35bf6cd0c1f45d35a SHA512 8ef6e7002a9d7cd5e03981552d69b0c6368215346ad1efdf949ec0099427c78f0228ed375d7537e2afe385089975bc05438a4e3112c2ea02453dba8b3f52c296
-EBUILD rack-2.1.1-r1.ebuild 1442 BLAKE2B 9650c67835055006b37fa02c9f12fe88211a21defd92499222f73976a8cd61c3091d720135a14c7ecb1970d09a729ac4097de862908d68c22b12dcb5d06c88b4 SHA512 f2d2a34a0e8cae8535df329aae05bfe639a8e0539dbdddf04a87726f0a2b4e2608d012d4b7a0eba28578d410ddacc972872d751dd20248768970bcff1c5353f3
-EBUILD rack-2.1.1.ebuild 1417 BLAKE2B c0d441fadbf3ae10b81570f42de687ff3f0090eee0f4f93eaa73cd26e45b113aef7df9e02ad9017dd87a22beb4d55a5641c43b47db3560af7b5b5c49b0642f42 SHA512 17f288f31d9e567ad36acf7106e7d9c5381d8361a0499844808612c5cc0f4c3b0c66babd8f5f08e93f460fcd4e9242215793298a2d256982702d8888323dd122
-EBUILD rack-2.2.2.ebuild 1492 BLAKE2B d3728b814fa6fbe7de1b4637f36d309bfcf4b809ee1f8ed49409b8f1c84f4aca2df65d99ecaf0d2af5ea25344ef33c1f85066fd8ac1d5b92437c1302e1cef3f2 SHA512 93f6f613b21bc6d208d170e9db7a989f077d7442823e3150ce774fc420593fa89d61e45940592935bc7e638af6e68937eb0527a270d56e24c497e249c9d57b1f
+EBUILD rack-2.1.1-r1.ebuild 1448 BLAKE2B a3bb4ef7718521399f0d66f12acff5e857412fafacdd47db1e65e71530ee4bb0cae262f711a83010b4c44beff9c0ad90865a164465d064d8a63cce1620e2b70c SHA512 d91831f8114ac1903f4416f69ca41b8e943518d65791f66f0b60006bf65d0b89d5b2830532c2dab1d45f729299c953dd5cd5983284164b6c04f91c6a7c38e001
+EBUILD rack-2.1.1.ebuild 1423 BLAKE2B abc7ab7b68a5830e8aba72e569c4d9a09c6c8a6d7e0bc26acb6c00f9e63179b208055b36f822cea0c404dd8cd5607089269e58de63cc55332fd82141cb71578d SHA512 1c91138763267d9ceeada6b678f64b2c00cdf81ba6352845267e2abb103de0edbd2463865e4f4c6bdacc8953ef23e6906cef324ab71757ffb2b99d4a4812c074
+EBUILD rack-2.2.2.ebuild 1505 BLAKE2B 391bd45521b46342c9fca3a71398bc9fc038ab9f7c68a4f462ea002951caa61ab761a836db9a899ec1bc3ea12774a3338e0aa2bc54c78a5d41625a93952d97d3 SHA512 ee56ce0406d562bfc1b632726253b79bedf695c18c0abbbcd5081b6d8d095052fa73ddff73ec9b4ea68bad87543c28612adf9eb7aede4d9176db26022b5b626d
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/files/rack-1.2.1-gentoo.patch b/dev-ruby/rack/files/rack-1.2.1-gentoo.patch
deleted file mode 100644
index 82ea127a8cb7..000000000000
--- a/dev-ruby/rack/files/rack-1.2.1-gentoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/rack/rewindable_input.rb b/lib/rack/rewindable_input.rb
-index accd96b..d71fde6 100644
---- a/lib/rack/rewindable_input.rb
-+++ b/lib/rack/rewindable_input.rb
-@@ -94,7 +94,7 @@ module Rack
-     end
-     
-     def filesystem_has_posix_semantics?
--      RUBY_PLATFORM !~ /(mswin|mingw|cygwin|java)/
-+      RUBY_PLATFORM !~ /(mswin|mingw|cygwin|java)/ && RUBY_VERSION < '1.9.1'
-     end
-   end
- end
diff --git a/dev-ruby/rack/files/rack-1.6-rewindable-ruby23.patch b/dev-ruby/rack/files/rack-1.6-rewindable-ruby23.patch
deleted file mode 100644
index 9d36a7328e2c..000000000000
--- a/dev-ruby/rack/files/rack-1.6-rewindable-ruby23.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 11b5a15dd1c8a41d87eb73df7bb99a3affecd787 Mon Sep 17 00:00:00 2001
-From: deepj <deepjungle.maca@gmail.com>
-Date: Mon, 25 May 2015 22:41:31 +0200
-Subject: [PATCH] Clean up Rack::Rewindable
-
----
- lib/rack/rewindable_input.rb | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/lib/rack/rewindable_input.rb b/lib/rack/rewindable_input.rb
-index 64efdda..dd6b784 100644
---- a/lib/rack/rewindable_input.rb
-+++ b/lib/rack/rewindable_input.rb
-@@ -57,15 +57,6 @@ def close
- 
-     private
- 
--    # Ruby's Tempfile class has a bug. Subclass it and fix it.
--    class Tempfile < ::Tempfile
--      def _close
--        @tmpfile.close if @tmpfile
--        @data[1] = nil if @data
--        @tmpfile = nil
--      end
--    end
--
-     def make_rewindable
-       # Buffer all data into a tempfile. Since this tempfile is private to this
-       # RewindableInput object, we chmod it so that nobody else can read or write
-@@ -77,8 +68,6 @@ def make_rewindable
-       @rewindable_io.set_encoding(Encoding::BINARY) if @rewindable_io.respond_to?(:set_encoding)
-       @rewindable_io.binmode
-       if filesystem_has_posix_semantics?
--        # Use ::File.unlink as 1.9.1 Tempfile has a bug where unlink closes the file!
--        ::File.unlink @rewindable_io.path
-         raise 'Unlink failed. IO closed.' if @rewindable_io.closed?
-         @unlinked = true
-       end
diff --git a/dev-ruby/rack/rack-2.1.1-r1.ebuild b/dev-ruby/rack/rack-2.1.1-r1.ebuild
index 7b0ca9fd237b..003840877047 100644
--- a/dev-ruby/rack/rack-2.1.1-r1.ebuild
+++ b/dev-ruby/rack/rack-2.1.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-2.1.1.ebuild b/dev-ruby/rack/rack-2.1.1.ebuild
index b17b475e82ca..66993f1521dc 100644
--- a/dev-ruby/rack/rack-2.1.1.ebuild
+++ b/dev-ruby/rack/rack-2.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rack/rack-2.2.2.ebuild b/dev-ruby/rack/rack-2.2.2.ebuild
index bf0c5fb5f528..b6b458f36930 100644
--- a/dev-ruby/rack/rack-2.2.2.ebuild
+++ b/dev-ruby/rack/rack-2.2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rack/rack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "virtual/ruby-ssl"
diff --git a/dev-ruby/rails-deprecated_sanitizer/Manifest b/dev-ruby/rails-deprecated_sanitizer/Manifest
deleted file mode 100644
index c4f077b72597..000000000000
--- a/dev-ruby/rails-deprecated_sanitizer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rails-deprecated_sanitizer-1.0.3.gem 25600 BLAKE2B 2b97f2cc3e40b8e50d62dea51de340a2d6624fd89c5a8f9a9f60215604137b169c69834d5131212ad3a61b1902aab61d01b287b9b2394f5e24a1fefe79049500 SHA512 017ea5aac0ce1fe41e51e4e957c3ce0c4c44b92e50c81740529a86d915483b8755253138d918c556383ecf0469ac83a7d30aaf8947e4768be33c3695ef4afaf1
-EBUILD rails-deprecated_sanitizer-1.0.3-r2.ebuild 673 BLAKE2B 2ebab61cdc83a3aa725dfe47911c4b6522d877cfb4d1effc9e5f26470af805510374725a981d79bc2f552615976fc1f1d3f20d19f297c06e352d130724eaf063 SHA512 0e713c5f70b63b364d5344da9744d930ef40af9798d710550ef90bf992140739b2fcd870fdad92d57e7db23e891c8dba4d1f6806058aa18801da696937d5b3a8
-MISC metadata.xml 358 BLAKE2B a75e0d9133997d19e61403d5a1f35fadf53897210f3ddcd69fe1e06fce8cf386acde94716cfd7b758f125ee110324e888e786017c5eced46b2de9359ff82e988 SHA512 ce4e694d08f3f1b89afc2dd3151c60bd331a564a7a93f4c552391fa676898f669fda4791fbaf999f8f70657cc982060f712eda5df5301436ffd692bbdbfd996d
diff --git a/dev-ruby/rails-deprecated_sanitizer/metadata.xml b/dev-ruby/rails-deprecated_sanitizer/metadata.xml
deleted file mode 100644
index 871f510d6abc..000000000000
--- a/dev-ruby/rails-deprecated_sanitizer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rails/rails-deprecated_sanitizer</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3-r2.ebuild b/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3-r2.ebuild
deleted file mode 100644
index d5b424d43675..000000000000
--- a/dev-ruby/rails-deprecated_sanitizer/rails-deprecated_sanitizer-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Deprecated sanitizer API extracted from Action View"
-HOMEPAGE="https://github.com/rails/rails-deprecated_sanitizer"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2"
-
-ruby_add_bdepend "test? ( >=dev-ruby/actionview-4.2 )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails-dom-testing/Manifest b/dev-ruby/rails-dom-testing/Manifest
index 63f5ed65d7be..118ab3a3045e 100644
--- a/dev-ruby/rails-dom-testing/Manifest
+++ b/dev-ruby/rails-dom-testing/Manifest
@@ -1,6 +1,4 @@
-DIST rails-dom-testing-1.0.8.gem 17408 BLAKE2B 50d786712c8d85426e773d66c6f7ae0f687b6be02579ae52e2a3b61637fd27be08519bee0fd00ca687e7ea2c21ec5633b26e9ef1fefddbe48ea38127349fc1f3 SHA512 313ee52e68878264122aeeb264f2a25eed3b7b1122e1e7ebe0223407e67b6c17e1ce98e6822b5a28fc8b0f3457bbdbe7e3f60cc9d03447a0a1034c151392dab4
 DIST rails-dom-testing-2.0.3.gem 14336 BLAKE2B 8740433474e88a7cb5be14b4357dd0b69d45a39972136cfe9a4d695d2478b5b535e2b407eb0acc9ec3abd633cb1f8591a634abe6eacd8ec38bba865ad32ed92e SHA512 910549bd42e6651b7160af0a4aaffbbdeaee829aa7c3f3552a73ba985ef1230d5586f5bf723018f2cd8c6d5c6238d045a8f3e686704b6989e5a56664061f6c72
-EBUILD rails-dom-testing-1.0.8-r1.ebuild 722 BLAKE2B ed2ea2bc5eebb4997e2eea46287678abf85954f9741ae83c6714eaed9ee03799f179c0526a29f391f4d901dae5eb80cb59ec4ba6a7991491bf0396baed1df314 SHA512 27e7431978afe4cd8366e4f69ba881155f8a129e01f08f5f6e89a03f658da52cbbb139cb45c5a8ca9b28f3ac38dc7e210e00ede8f3dbdadf121f717c8c134489
 EBUILD rails-dom-testing-2.0.3-r1.ebuild 651 BLAKE2B fe79dbcdb440b568e8780aaeca2560654c460279e35a16355e4b1bc6451f3be118c590db301f1421c392af3a42683c1c90a89a2e7a3304d64c67214a31983283 SHA512 e5039f3ba742fe26d588cc46f4857f7f713bb763e1696cc41f9c3136b1b42f81129e4ea5b1ce50337b227d056c242a53f81a44becfc8fdcd637ae667dc07c8e3
 EBUILD rails-dom-testing-2.0.3.ebuild 662 BLAKE2B cede5ce79ab7f0094f1610fabb1b57548de8bdf835f8a11529fe9f4858b93a52d4e55883c725916de14e0cd2bb8b7b78c8423fc54cbb0bb6b7d8dab07ff4560e SHA512 abb8090adc6c48d2b86eaa7c7ae47f99e53d36e74ac3afafdbaa4b5a898a1610388b9991e97b39aec715c71c30ce0af7927887dd1a5e1667c87d970e075b3a6a
 MISC metadata.xml 350 BLAKE2B 1c2caa318832438e9f00f976edbb95493e9313ecbc0b481cb1ebcbdcac1bd9068eddf8ef6e7becde15efef1e33c6a83a5dcb9b5e20863a6081f10faac65d55a3 SHA512 a0ed76fb694f21c179472ddc7081b3114f9762c65b98cccb47c419dd7626701cbc111205dce3976d54f0fe5811a256da4edd2862bbf075aa62dcc8cd4fbcf21b
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.8-r1.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.8-r1.ebuild
deleted file mode 100644
index d7f1ca77ce09..000000000000
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compare doms and assert certain elements exists in doms using Nokogiri"
-HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/activesupport:4.2
-	>=dev-ruby/nokogiri-1.6.0 =dev-ruby/nokogiri-1*
-	>=dev-ruby/rails-deprecated_sanitizer-1.0.1"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 72fa8be63def..d4edb3095444 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,7 +1,7 @@
-DIST rails-4.2.11.1.gem 1476096 BLAKE2B 18fbaea1b955e586bf84db43dd24998e18175895385b7d360f0b87b8ff283313b360180adba73f1172ce7a3633813e8e59b3dfa18111f439afd54f3ed576440f SHA512 55cd57fdd9d8f1efa0f8c7e7c1dbcadc1a7c2bdcb6230a1c88cea5c4bb567916d1c511749a08162e509c6fe15d4f57634bcedd4e2a32fe6ed5a726a229a6ecab
 DIST rails-5.2.4.2.gem 6656 BLAKE2B ff439904b04a0e3d90e8d6c684d7ec758d40942c87aebaa3bd67da2a8a770125f25705f64eab6734c1745844b0b7f4ad5e425ccf4509bc62a1ef86ca3361620e SHA512 6960d9441d372bcfe55a18de2aeec6f7246af2a259a14b72f475771d02e44ae5a178fe14a7c05e05c9083c4d5277a5a834a2a46ddbdad1b0261dc9df1148ddc6
 DIST rails-6.0.2.2.gem 6656 BLAKE2B 631342c885e93ee6ac69615051a6b244de0911669a479732897fe73a77b182a93ced8b00c18b53b6ceca14549d32468cee7170c6504bb61de2b6b9734cec8909 SHA512 af258bdd3c6aa8a5f511ed98dae5c97169a895aba32ee8db5fd36f4be506a3eab6595acab13cb5a6eda1e721f83881c372b25a4fdb20774fd7e247286744b502
-EBUILD rails-4.2.11.1.ebuild 1088 BLAKE2B 7b6cdbe9de5e1dc32be03074566b8a3c95ffe133ab0f69f43b339206d0ef0b679c2815bf5cc8eaf8c59b8c36468ac4e84220098aad9d7ff6a8a67eea9158943e SHA512 8807151d146dd53243833d643725f0cb77ea75381a7f6617940c46e526025c325efa043899b7943ac2fd255dd51e94ac4b6418bd52fbb53abfbc95d94832cfc8
+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-6.0.2.2.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-4.2.11.1.ebuild b/dev-ruby/rails/rails-4.2.11.1.ebuild
deleted file mode 100644
index 9914fbb66511..000000000000
--- a/dev-ruby/rails/rails-4.2.11.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-# The guides are now here but we'd need to rebuilt them first.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md guides/CHANGELOG.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="http://www.rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~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/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:0
-	dev-ruby/sprockets-rails:*
-	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.ebuild b/dev-ruby/rails/rails-6.0.3.ebuild
new file mode 100644
index 000000000000..3be9b73306e0
--- /dev/null
+++ b/dev-ruby/rails/rails-6.0.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="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 127c4489f770..c6b5173f7f7c 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,7 +1,7 @@
-DIST rails-4.2.11.1.tgz 4081006 BLAKE2B 7db84961963f529a9b6c06011bb6e32b56f4beb064de31c811a092d27e93156669ade4dcceb7d8abcdba4845d42258d904f8ecaf79198af1c0e2afcb33fe3fe3 SHA512 198fa072f3f09a9893377439ddd1803effdf04a33ae7b609234464e7de9ad960439d1b80ae62e1f9b223b3173839be7233c314a72057933b43672f390d96a8df
 DIST rails-5.2.4.2.tgz 8823143 BLAKE2B 273bee6ccc2354bcfd8d24b320fe69c24f643c196eba053c727d30b13d4178069068c430a0a4112ae28c3e4b5a5dde0b66a7c46c7c28054f2b7a678427f478af SHA512 21561407a0b606dbd2fb6ad12ef910c0bdf3d5162db7e55f4f41f698280ba73664b0b5594930d4cebcb42a66e2e5e22de3523789818eb424443e8c5b2316b8fc
 DIST rails-6.0.2.2.tgz 18556125 BLAKE2B f4ed5cc6cbbfa84fb687aba5a6c8f2f6ab68febb41147c40ed8dbc6253c128adbac6503e65e89fe672f50270716d197d8c05b4e1e286aafd76581fc167e6c5da SHA512 c1aab2d6c72948c75a047aec9d9f651f0c1bae78bb17e2fa0cb393113ee1e59980dc093e6f3fd3b2f3839c9b3bb4afcd0b0badfd9574b35b932275a9d9800689
-EBUILD railties-4.2.11.1.ebuild 1707 BLAKE2B c4ee99a40cbeef43d8ab63134f581c01be1b8c6d27a10dc7368a6ef837c515309712e9e3d37fb153975360cba76e66ebf09dd056d486e9a5948c75c8fa862b7e SHA512 c8a68a17c8cc293bc7259751414f245ace596385c39a77da025ee85c17eb065bbc1528f8b173f132893f61f5c09f91f227452cb6f1343484d967e3d16a533e5e
+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-6.0.2.2.ebuild 1600 BLAKE2B 440c867fa1a1dd8f8f0c4c3c9986b91ce4e7606221cb285d822f9f2d3d168190827405f0a7eeaf681002dc26fcb0ea97ec229030a513cde7b0e561812875ada4 SHA512 b6b45d1170b3cc69c575591ddb54e2d9686fae9293a59e867dc27a0ba51e596871ccdd081dd90c872bd38856892c42eff890b132f781ff4c22c58bf470a86b18
+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-4.2.11.1.ebuild b/dev-ruby/railties/railties-6.0.3.ebuild
index 791e8e0731a8..828467ed5289 100644
--- a/dev-ruby/railties/railties-4.2.11.1.ebuild
+++ b/dev-ruby/railties/railties-6.0.3.ebuild
@@ -1,26 +1,27 @@
-# 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"
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_TASK_DOC=""
+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 versionator
+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="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86 ~amd64-linux"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -30,13 +31,15 @@ RUBY_S="rails-${PV}/${PN}"
 # investigation.
 RESTRICT="test"
 
-RDEPEND+=">=app-eselect/eselect-rails-0.21"
+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/thor-2
-	>=dev-ruby/rake-0.8.7"
+	>=dev-ruby/thor-0.20.3
+	>=dev-ruby/rake-0.8.7
+	dev-ruby/method_source
+"
 
 ruby_add_bdepend "
 	test? (
@@ -48,9 +51,6 @@ 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
-
-	# Also allow rdoc 4.x
-	sed -i -e 's/~> 3.4/>= 3.4/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index 6dd8ab232052..e380e4a72d8b 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,9 +1,5 @@
 DIST rake-compiler-1.0.7.tar.gz 33444 BLAKE2B c3a92206d4d7defdf21295aaf094f704596962a3ee79c3517ea1058732e1f9f378b5f14bbe3b9652572564d11c566e26014e187dcdb488409bf95ea9a52e0a7c SHA512 fa901f5cc48891f07bd8d9a27cf4e745e87d5a667dbee0c9f4b43f9564fdfe3067b9c658f10ea8bcacd32ea7320a542ef0fca9373147057472f5572a4a4c5268
-DIST rake-compiler-1.0.8.tar.gz 33547 BLAKE2B 542544543cd6d02a9ff964571244c65a0d748e09ea88027a514f25d13086463094aec29b0961881aa175f9553afcf14fc9f7c12dba0e96a07bf88e21f51e87bf SHA512 30b753d45a1180e034b520ad6385f2799098f0916d55e8b4729f5e3a29dabc1acfa292475edfb384c7809543e1c3e428e28db1bacb5383deb9f4bb31b18d6fe5
-DIST rake-compiler-1.0.9.tar.gz 34780 BLAKE2B 59b736dedf70de3daffdf30b74d251dc3b3d7588610dc57d3aa7e13b55dad2d637b1569beb31075a0e5336d9827adfe3b9f89c9a8b75b141c3012a1d48274d2a SHA512 8a5ccbc4bbe6a546634f939c1cbe42b35d952173bbe914e7a22eb78f3f2e85b48e207ff36b70432fe469a2d07d62b8e59c9827352181122fde76ba89bbc2aca0
 DIST rake-compiler-1.1.0.tar.gz 34819 BLAKE2B ec4fec1eb92031f9f6b378b190c4e8a2f2627623afd6fb11922f71a93431de94bce640863deea2aab05656612533ee2b110f295f87590b48500583af71b08dae SHA512 77338776506df66c2e99e9b1b82dc4d54cc4e7c8fdb1f8b7b6d7507b9f9cb0718839e5139e9c0cb6295259e819dc8a011101e2427cdd387b568b639889321d60
 EBUILD rake-compiler-1.0.7.ebuild 1423 BLAKE2B c5893a5d99de366b4c86d631dd553b20caa3e4f3086a8e802039933dd2021ef6f7bfaad4acfb13e80262d16dca69006fcdfdc27c88212e2e8b5df60f19c44cc7 SHA512 fc0aa2f699b832f152719b4748ea17d1ce9ba51d1a7549b3fcda6523047430385d26fddf1f6db3a21ed12dc46d73c7c19131c1ce1b7ab089449ddf2bad853380
-EBUILD rake-compiler-1.0.8.ebuild 1430 BLAKE2B af3b9beaf1952a3ea3663f6580874918e782ab7adbe26940576ea7ba414084d9906ef1ae1cbfd00dd6f7eeb9d29fc13e9c011efdebebcf786699ddc4b7e02719 SHA512 5b3717b66d97aaf0e2f0c252fc4972c5ca0e48e4fbe5204abf5e8b25effd121c1e0b6ccc84c56153282628458499f32c1453c74d3af3465e6f2ba118699ef427
-EBUILD rake-compiler-1.0.9.ebuild 1474 BLAKE2B 7d07566b2b767b32c241e81eefa73bb042cce61d845b50de3765a65de3466af46941e8577d28310dbc9f37288947c99344fd10d07050a3bada62940b76ccaba7 SHA512 e1387624d9c447447a1ba969e2bb0a3bc05009a53b0b1f63ef8b334accfa513d83202d0ed350c51c0deaebdc42de9fbbaca8e8572500f502a92d2c947be088bf
 EBUILD rake-compiler-1.1.0.ebuild 1481 BLAKE2B d5466c316eaced0993d74209a8e9ca4d50c59f784f92748945a6a875a9673d33bd51d503c899dbd367e9b9b47a706c1eada051136d3e541a9b0544712e56bf75 SHA512 9c18390fcf04eef8429139b8ae351559ef089be90b7f9165c29a178275c19bee0886e79c70b36e6a77bf41e128451d06f0a692649ea4a4a6695b14cb46599138
 MISC metadata.xml 350 BLAKE2B 35df0cbf74d904e36dc5b5f34c31a41bf9659942415655f635a112d01e98833babfd42640d5155392f5563fd1756b104671348c077e8a62a2d6efaa68389a3f3 SHA512 2f027e154015dbb7a0535356a313b2f4bada336f6c1549aea9db77f57b43ed7ff19408e3ba507010d50e0953f5f6fd51d9bec956653725e1e087d94a6ae3eb83
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.0.8.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.0.8.ebuild
deleted file mode 100644
index be4047d3141e..000000000000
--- a/dev-ruby/rake-compiler/rake-compiler-1.0.8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
-HOMEPAGE="https://github.com/luislavena/rake-compiler"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rake"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-USE_RUBY="ruby24 ruby25 ruby26" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	# Make sure the right rspec version is used in cucumber.
-	sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
-
-	# Avoid failing features for native gems, this also fails with rubygems
-	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
-}
-
-each_ruby_test() {
-	# Skip cucumber for new ruby versions (not ready yet)
-	case ${RUBY} in
-		**ruby24|*ruby25|*ruby26)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			ruby-ng_cucumber
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			;;
-	esac
-}
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.0.9.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.0.9.ebuild
deleted file mode 100644
index 0c864a706a3f..000000000000
--- a/dev-ruby/rake-compiler/rake-compiler-1.0.9.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rake-compiler.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
-HOMEPAGE="https://github.com/luislavena/rake-compiler"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rake"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-USE_RUBY="ruby24 ruby25 ruby26" ruby_add_bdepend "test? ( dev-util/cucumber dev-ruby/rspec:2 )"
-
-all_ruby_prepare() {
-	# Make sure the right rspec version is used in cucumber.
-	sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
-
-	# Avoid failing features for native gems, this also fails with rubygems
-	sed -i -e '/generate native gem/,$ s:^:#:' features/package.feature || die
-}
-
-each_ruby_test() {
-	# Skip cucumber for new ruby versions (not ready yet)
-	case ${RUBY} in
-		**ruby24|*ruby25|*ruby26)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			ruby-ng_cucumber
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec
-			;;
-	esac
-}
diff --git a/dev-ruby/rb-gsl/Manifest b/dev-ruby/rb-gsl/Manifest
index 9f57cb004923..fd6f28b5b436 100644
--- a/dev-ruby/rb-gsl/Manifest
+++ b/dev-ruby/rb-gsl/Manifest
@@ -1,3 +1,3 @@
 DIST gsl-2.1.0.2.gem 735232 BLAKE2B bb8aa488b5d3bf7c2f3facf34093c985c63bfe692933b21eb8273af38e6788691593bdcc6fd52b9e22635d1b8195f81d1302edab7c2915a19ce9574cab184d84 SHA512 c07adfb44980ca813e114db2b0917f6b2dcb7d3bbe0ccfd9561519b4e574991f3c72f3e7115218f473154690f9284bf89c968d3c6d52d29fa0a232a1160d2704
-EBUILD rb-gsl-2.1.0.2.ebuild 1164 BLAKE2B 38a91e3898e9a6d34c0951df93432e3f560f15daeaf41de5710c06a2e6f980fbb5036e38e5a44f99dbcb8ca501936136236c211863dd76d30eec44c19f92c7b3 SHA512 01b381530b5032ede709e1780014ba8b4848e126da979dd3af8b51ce3832fb606f3b1df28ba2372901e805365f37a0970677276f8503873ecea9f5897c2c6c0c
+EBUILD rb-gsl-2.1.0.2.ebuild 1164 BLAKE2B 15a02cca20efb147cfb83a11ac094ecd936ef2e26745180184eca3d280129accd38dca8d6712b91ad0a7aff57c1fc610c164d8ed7a36592594ba37310f30ce50 SHA512 1e6fc72f1479c6ac7a85a9c6eb1cde8cfdc4e41e66bf4f894b32097919573baf35bd9ffd10b0ac0180e19697c1725d5c77b773a195cd23f0697d6038892a31d8
 MISC metadata.xml 340 BLAKE2B 768b125254ab2e25701a50e2735aa8d25a128d27ef4dcec356206519f0f017d77b3ef8e75cd2a519d74ec1574404004ad09582a872493fcf9f740379eed4dc79 SHA512 1278dd12be4197ef7d217b0106af35cd983878c36362445d09b6a76a61e0d7d1d0a04a5c84c76eceda98a60055659c366698f7faabae7e5d1a4004a1eb7e93cf
diff --git a/dev-ruby/rb-gsl/rb-gsl-2.1.0.2.ebuild b/dev-ruby/rb-gsl/rb-gsl-2.1.0.2.ebuild
index 1cb52c80d9a7..2a23d4e3e7ea 100644
--- a/dev-ruby/rb-gsl/rb-gsl-2.1.0.2.ebuild
+++ b/dev-ruby/rb-gsl/rb-gsl-2.1.0.2.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_NAME="gsl"
 inherit ruby-fakegem multilib
diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index bc3366b3a523..e74fd2f666b8 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1,7 +1,10 @@
 AUX redis-3.2.1-local-redis-server.patch 1710 BLAKE2B 8ade0ba31d4d4466e6f874e2303bfb661d4773346f8bc2ac2144ecb8466da4173289d57d9c71f9e90daf4b560724aaf4a854f623c9f09f098f45498c16f08c6e SHA512 e10f59dfb7249874b0e882b888904901fa780ad1687b5000dc73851fe53e5bd2319c4418847ecca4e22efac404a4a283e108755a03f0615d76e0f23583602576
 AUX redis-4.0.1-local-redis-server.patch 1273 BLAKE2B 108c8baef8beea68327c3b9bce8e56d133ff6357068407db08e93b70305726cd061585ec62ae28f8450ccb29b950eb20495c890234c738890aa0228591e97d79 SHA512 0eef2e7535ce06c4f0a86fe3118d12b95ea36f968fdc015fd68faa410041911eb62ace26155fb628751a3e3d264a1fad41890095cbadeb230630c64009b273a0
+AUX redis-4.1.4-local-redis-server.patch 1454 BLAKE2B cfbb707109cac75fb38a614c41b3cd0cb9b9f70bc9e62a2fcdcf9208e7b1b0c3709101d788d1158b0cc3c4e47f9817a82e88ea2165b85304474f47cd1d1cdac6 SHA512 903d186c9a834208f89b06c4ea2ae2d8e8559e0d8d5d0e71a0c7ab8ffd212463e34b1da551b5ad1267a3283eb4c735fb85a94b696d403399368d3d97a2b50abb
 DIST redis-rb-3.3.5.tar.gz 88500 BLAKE2B a06e0e08dba211edb6393dd85f7957e56ad928bbd3be105ddeb6ad4f2cfa1d354289ad67f3c8c27d5fd9f8560167708a6937e2950ae12ee0d42d3321940d1e85 SHA512 b79f535b6dff26ae2b0213dd77d53b952fd877ef5193c8bf0f6e5cd0da1934d79711bf611b839ce8b97d7cf145e7e912d2956087501a2f841d42775dc0105a0c
 DIST redis-rb-4.0.1.tar.gz 87859 BLAKE2B c53f9a4ae96195eeab9f8fd0eae1ec8bcfeee7b717faf5b85c127ff90a88fbf9a0cfcef9d4c002ef7ee07f12a8e813bfd3e4d284a616d8637029d51a6c067f34 SHA512 c377512e0103a1aadb4aef3e64983fd4b20a26d67320ff0c500b7617c8b3bd5b4ba2240488a7d55be1301bb0b926398835f5c242ae97afe9141b3499da358eb9
+DIST redis-rb-4.1.4.tar.gz 125556 BLAKE2B c1a9e7a365bb12c4aaacfdaff776e370c715a594a05c4270c2dfe85bdc540e915f797fbfa1dc87e10fb03faa56ff572b7e24f7a1244166ea1e1b611900bf22bb SHA512 6c12a75832e8493891ba50ca452960b5748593334287a93c40f117b0e522d483ca0af9a6510271c19f306dfb89a71dd9a7d02c1c8ad3ad82e1d4b31f0b51adad
 EBUILD redis-3.3.5.ebuild 1111 BLAKE2B 9cda0e7a6bee91133d9277b28ffa16a719ebbf1c297000961172d2d7feb1087e97344010c18c77f45f2337bc8679c21d1ece2266f7c4e0c8565e1a6a3e4deaa8 SHA512 df503eafb017f582f34e233b9ea8d167ebf15afd68edc5c89697a2871eba400612b72d5cff39399813deeb26ad8e2c11c4a1a013298b7f7008960a8ca5ebe1f3
 EBUILD redis-4.0.1.ebuild 865 BLAKE2B 4ecdf94e28f8c2a83d9fe5905d77b92e5f6ef3769d5bd7abeb4f8391616a1377c1d6ef337e97b512319fc4d4c6c2e4981cdbc8537feaa6b34c4a85f493ef6ea0 SHA512 1823730c4ada0a1234ea590de9c6f43dc7f2e6fe38802c9fc9af8b2404e3cbbc1f3034e42623bf6d55e92cb55fe186b869b16d2eaace3ae2231d78a7c42546ff
+EBUILD redis-4.1.4.ebuild 1148 BLAKE2B 136d8fcb1369dd074a02ea23e0bfc6583ee9a020fab0d5028e3de34890279f661e0e34d088b9e7952561676a0fa95ef53f295dba95d58fa91cc3da676afe380a SHA512 06d964009f3a942ab4b6de20c979de27d8e49ce5abebae435d8ffa5829665fabcbb950ceb3c90a628369cb34c1cdb7ba8d700ecccf5005071fec5c7f235ff49a
 MISC metadata.xml 340 BLAKE2B 5b94605ef889ee35d161b2dd31d4b5b6c2411522c448d6e937b278ecac5fdc0b07c20956359809a78f27a9da0f0991f4b7be121bb13bd783914fd8d87a977510 SHA512 ea208ef15e2354cac75844869a922aaf69c7db9c0776984c4282fecda4ee8003504bbf013c29f008d616aff92cccc74bb157bf7d7f8c44777cf9dee7f15ce149
diff --git a/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch b/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch
new file mode 100644
index 000000000000..b9db61a0a6a7
--- /dev/null
+++ b/dev-ruby/redis/files/redis-4.1.4-local-redis-server.patch
@@ -0,0 +1,40 @@
+--- a/makefile	2019-06-29 08:02:02.519804948 +0200
++++ b/makefile	2019-06-29 08:03:43.125559643 +0200
+@@ -1,16 +1,15 @@
+ REDIS_BRANCH       ?= 5.0
+-TMP                := tmp
+ BUILD_DIR          := ${TMP}/cache/redis-${REDIS_BRANCH}
+ TARBALL            := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
+-BINARY             := ${BUILD_DIR}/src/redis-server
+-REDIS_CLIENT       := ${BUILD_DIR}/src/redis-cli
++BINARY             := /usr/sbin/redis-server
++REDIS_CLIENT       := /usr/bin/redis-cli
+ REDIS_TRIB         := ${BUILD_DIR}/src/redis-trib.rb
+-PID_PATH           := ${BUILD_DIR}/redis.pid
+-SOCKET_PATH        := ${BUILD_DIR}/redis.sock
++PID_PATH           := ${TMP}/redis.pid
++SOCKET_PATH        := ${TMP}/redis.sock
+ PORT               := 6381
+ SLAVE_PORT         := 6382
+-SLAVE_PID_PATH     := ${BUILD_DIR}/redis_slave.pid
+-SLAVE_SOCKET_PATH  := ${BUILD_DIR}/redis_slave.sock
++SLAVE_PID_PATH     := ${TMP}/redis_slave.pid
++SLAVE_SOCKET_PATH  := ${TMP}/redis_slave.sock
+ SENTINEL_PORTS     := 6400 6401 6402
+ SENTINEL_PID_PATHS := $(addprefix ${TMP}/redis,$(addsuffix .pid,${SENTINEL_PORTS}))
+ CLUSTER_PORTS      := 7000 7001 7002 7003 7004 7005
+@@ -43,11 +43,11 @@
+ ${TMP}:
+ 	@mkdir -p $@
+ 
+-${BINARY}: ${TMP}
+-	@bin/build ${REDIS_BRANCH} $<
++#${BINARY}: ${TMP}
++#	@bin/build ${REDIS_BRANCH} $<
+ 
+ test: 
+-	@env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
++	@env SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test
+ 
+ stop:
+ 	@$(call kill-redis,${PID_PATH})
diff --git a/dev-ruby/redis/redis-4.1.4.ebuild b/dev-ruby/redis/redis-4.1.4.ebuild
new file mode 100644
index 000000000000..ad182165d50d
--- /dev/null
+++ b/dev-ruby/redis/redis-4.1.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+MY_P="redis-rb-${PV}"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="redis.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client library for Redis"
+HOMEPAGE="https://github.com/redis/redis-rb"
+SRC_URI="https://github.com/redis/redis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+DEPEND="test? ( >=dev-db/redis-3.2.0 )"
+
+RUBY_S="${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.1.4-local-redis-server.patch" )
+
+all_ruby_prepare() {
+	# call me impatient, but this way we don't need netcat
+	sed -i \
+		-e '/test_subscribe_past_a_timeout/,+18d' \
+		test/publish_subscribe_test.rb || die "sed failed"
+
+	sed -i -e 's/git ls-files --/echo/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/test_connection_timeout/askip "requires network"' test/internals_test.rb || die
+}
+
+each_ruby_test() {
+	RUBY=${RUBY} TMP=${T} MT_NO_PLUGINS=true emake -j1 all
+	einfo "Wait 5 seconds for servers to stop"
+	sleep 5
+}
diff --git a/dev-ruby/rex-arch/Manifest b/dev-ruby/rex-arch/Manifest
deleted file mode 100644
index 1af5acef64b8..000000000000
--- a/dev-ruby/rex-arch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-arch-0.1.13.gem 19968 BLAKE2B 6bceb0c2c08c58d3557d4d72ffcd017c58ddf2bf2d622e576a9e9cc41893416965df9508fe94ec9def1826b2f7f2bf5d9d0715e1f118bba016ad4364ecce99b0 SHA512 23f24d407bb2d34390a892f258005498c373062da883059e9e92df14c9dc18a0381f075d2df0ef8763d9bf3595b8cf578655efd3a613810b83bd6d8425a162c7
-EBUILD rex-arch-0.1.13.ebuild 458 BLAKE2B 675c8c0c32fa493855efb0c021490333b42635d86a4d09ab8f33d6ca32c01c8ac2127c8a4d8a9c395306d8219ba5baa7dae14f812b80e6e4a014dde8fc3fd005 SHA512 e02b0eb179313696f99ff82d51722db7620ce69df223a582fdaa5925b5c9aec9b1519f2e54fec227b9c929267822fae681e90b19c791d3f9255e34b42e643772
-MISC metadata.xml 389 BLAKE2B 544f3d8d83c609027ede420284a2872d974dff70a2da51590de644432807e6d4e5f0f466d6928ef4f519d5537f368e70149db370bf4051c85980cfc25d34b6a4 SHA512 d2b55e0366bd178ca9117f1768f939af7a8967b8f02244bed2839b69f4f5ef8a8d6f13b1d6014c8f2ef20dff7c9def63592c80c2b934b172103ace300b441a15
diff --git a/dev-ruby/rex-arch/metadata.xml b/dev-ruby/rex-arch/metadata.xml
deleted file mode 100644
index 84171b9257ef..000000000000
--- a/dev-ruby/rex-arch/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-arch</remote-id>
-    <remote-id type="rubygems">rex-arch</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-arch/rex-arch-0.1.13.ebuild b/dev-ruby/rex-arch/rex-arch-0.1.13.ebuild
deleted file mode 100644
index 17c9a180946e..000000000000
--- a/dev-ruby/rex-arch/rex-arch-0.1.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="architecture specific information for Rex"
-HOMEPAGE="https://rubygems.org/gems/rex-arch"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-bin_tools/Manifest b/dev-ruby/rex-bin_tools/Manifest
deleted file mode 100644
index 8c471a9b49f9..000000000000
--- a/dev-ruby/rex-bin_tools/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-bin_tools-0.1.6.gem 81920 BLAKE2B 543e9c293b7589792c5cad55dbe7b760b97194a6adb01953ca81ee603e1c576c7f391012dc669fb03d7cf18ceab0ec88e0b4b6e0ac56fe21ffc4c6bc8b937fd1 SHA512 30e9137194b97aae0a0972a10cf415ebd28a11699ce03dda2c32529d985d0376a6028c40bc8570ea8328e076c51b7a52d26872c43074db2a98ed4b2db1969c2d
-EBUILD rex-bin_tools-0.1.6.ebuild 649 BLAKE2B 883c1c6e37335370431f9e895afe7205a440eea54bb1fe0053c804afa460568d075d1e405ef621a186ba4fc468e041b716b4e7fcc15ee1cfa3b93d886c9e3a8c SHA512 33d1e639a32231e43828661759efc5fe3549ceac1247abd2622b655af7afdac1a84775c6a4f8aae420d88d8e4b8fba93762725ccddaf8240b91a73f8364b4134
-MISC metadata.xml 399 BLAKE2B b82cb7fb695efe7a4ff0e6e83e93dab0ed7f6704dd916161cd4042354714963096668585d421a362add7f73e966ce872d6533ffb6e0f935352f5e21214844b6e SHA512 7d9afbd71bb64675d28110ed1120f45f0369610b4a295fc55652eb75fd1c3bc5ea964635540a9c0161ab1f37981da6ac2c3e9faf5ce239a72b5f90b9dd8aa43b
diff --git a/dev-ruby/rex-bin_tools/metadata.xml b/dev-ruby/rex-bin_tools/metadata.xml
deleted file mode 100644
index 27cee0e97677..000000000000
--- a/dev-ruby/rex-bin_tools/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-bin_tools</remote-id>
-    <remote-id type="rubygems">rex-bin_tools</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.6.ebuild b/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.6.ebuild
deleted file mode 100644
index ac87d48570e1..000000000000
--- a/dev-ruby/rex-bin_tools/rex-bin_tools-0.1.6.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_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="suite of tools for analyzing executables to find specific chunks of code"
-HOMEPAGE="https://rubygems.org/gems/rex-bin_tools"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rex-arch
-					dev-ruby/metasm:*
-					dev-ruby/rex-core
-					dev-ruby/rex-struct2
-					dev-ruby/rex-text"
-
-all_ruby_prepare() {
-	sed -i '/bundler/d' Rakefile
-}
diff --git a/dev-ruby/rex-core/Manifest b/dev-ruby/rex-core/Manifest
deleted file mode 100644
index 27f4f08e0fb9..000000000000
--- a/dev-ruby/rex-core/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-core-0.1.13.gem 30208 BLAKE2B 3de93b7869e751574979160d458406cdb83f6683383b6e60e7defe7e02fd7fe02c39589983f6800d07d48527572869f685e57fa8dc3f2a0ba9fb1cf1cbf6ad84 SHA512 d7a402f732620a7ce25d3401fea9c97b4dbac8d37fc8d9183d621bfc16004e2f7171e0346b05fcb64a9c2af8b2b17e32d6ae11268a5300cc31111ab83dabfa9a
-EBUILD rex-core-0.1.13.ebuild 494 BLAKE2B c081006abe17a587aa479b11dcadea1a66106701abf9327b00449f537ecb7ef52f367afc6a9314b3054f8d5263420190f90be177d76eef7caa514debf1aed6c4 SHA512 a008ab58343720144e36dd860084877a3973fcb58f8dda621191c9338f341f024c860a03e0f757c0ed2eabc01333b6451cd44440fa56aa5d6b8a0b7189cc834b
-MISC metadata.xml 389 BLAKE2B b5042775683c44b7e922a391802f11ccac7ead99797112bfd3858142eb59cae10755d469c9d1a0bc00029cb7106ac3956dd866921f1960c5f45e4440bf5b7ee5 SHA512 bd835c3405637721df2713e6cd302afd6733af5b620e3e02d89601a89ac902e61fa7bdea74735ec6d1b102c9d77bfda18ba660e9c9ccdc3f36acaa531c89a381
diff --git a/dev-ruby/rex-core/metadata.xml b/dev-ruby/rex-core/metadata.xml
deleted file mode 100644
index 8d9b75a1a3c8..000000000000
--- a/dev-ruby/rex-core/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-core</remote-id>
-    <remote-id type="rubygems">rex-core</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-core/rex-core-0.1.13.ebuild b/dev-ruby/rex-core/rex-core-0.1.13.ebuild
deleted file mode 100644
index 48969fa3f4f4..000000000000
--- a/dev-ruby/rex-core/rex-core-0.1.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Core libraries required for the Ruby Exploitation(Rex) Suite"
-HOMEPAGE="https://rubygems.org/gems/rex-core"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i '/bundler/d' Rakefile
-}
diff --git a/dev-ruby/rex-encoder/Manifest b/dev-ruby/rex-encoder/Manifest
deleted file mode 100644
index a32c246777bb..000000000000
--- a/dev-ruby/rex-encoder/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-encoder-0.1.4.gem 40960 BLAKE2B 8ed2e19dc422249ae71f6725e475c7fa695791ee2d4d79ebc0a9c1a2b44a8e90728fce12d6c5eabc3aab472277038d465acd0e430f8cc81947756c1374acb184 SHA512 30c83308cba74ff3204d5b923370b80e22817b824341d6544ddd68e7f86465d52ee1eacae16c8276bdd7f785efd74de2423a9f4866e8b50e17b3424c96ef0ba4
-EBUILD rex-encoder-0.1.4.ebuild 648 BLAKE2B 114ead67a81879751ca8fc3ed3273be7ae0c1e52bb695fddba02b45567d59aa40c89a85c6523dd0d5046b938f49b5da3cac4d2b6abeed70d8eb93ced35383f16 SHA512 f693d261519cfe2b979a62103038836a1cb3bded69d553d4c19420adbbd01de86cbba9245cbdd48e2c4df0f2b59891378ddf60ec948d7020b1b87bf3ada5b8c5
-MISC metadata.xml 395 BLAKE2B 7edfb355a33e38963e2360abf61815b8848ac07a91f45718a970ecb1dc80c775e23f2c8b06e155011472bc1e468627eb36302fa6fc252aceb1563d484a3af3ca SHA512 57f77e7772cb1d0cde7ce68242ffe773a4960434a99c8f2e873d88ca06f5ea4cb1f56d28b17849f6a36880329b2642f3bf93776fec16c10a15ab017ec4ba532c
diff --git a/dev-ruby/rex-encoder/metadata.xml b/dev-ruby/rex-encoder/metadata.xml
deleted file mode 100644
index 53331bbbfdcd..000000000000
--- a/dev-ruby/rex-encoder/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-encoder</remote-id>
-    <remote-id type="rubygems">rex-encoder</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild b/dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild
deleted file mode 100644
index 4ab72064dbb4..000000000000
--- a/dev-ruby/rex-encoder/rex-encoder-0.1.4.ebuild
+++ /dev/null
@@ -1,32 +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"
-
-# Specs are not provided in the gem
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="provides the basis for all of the polymorphic encoders that Metasploit uses"
-HOMEPAGE="https://rubygems.org/gems/rex-encoder"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-RESTRICT="test"
-
-ruby_add_rdepend "dev-ruby/metasm:*
-					dev-ruby/rex-arch
-					dev-ruby/rex-text"
-
-all_ruby_prepare() {
-	sed -i '/bundler/d' Rakefile
-}
diff --git a/dev-ruby/rex-exploitation/Manifest b/dev-ruby/rex-exploitation/Manifest
deleted file mode 100644
index 9599cce6cb8f..000000000000
--- a/dev-ruby/rex-exploitation/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST rex-exploitation-0.1.20.gem 79360 BLAKE2B 59dea65582647444e21cc1b0ae744c857b3007b8215c81244d37c6f3d8abcb1ef1b1d01428f306b4c5f6fdd1b3db0326de3c50fa38fa50505b4de9c05ba518e1 SHA512 e1df4ffde57ab40bf4b2492370d44bf064f39f657c7a8140416f51560a0be9b31ef95b1bdadaae6f6ec75c86e0978b41112a18caa1f69262c67945d3529f9990
-DIST rex-exploitation-0.1.21.gem 79360 BLAKE2B 78c31cf2255b8cc5fc9e7886d20bbad85f48877798ff68efaa72e22de9d62f3a78bc980a2ba1507e5aee6b35ba9fdc7b352f11985202584d10584fd84018f0bd SHA512 81cd2e8ab8a8230be66f8597a85894cf92e969c21864c04525eed93a614eb467e6ac6d1bb2bfc91ff68b1795be7a27c03c136c5976f9f76736e972bf2e7b890a
-EBUILD rex-exploitation-0.1.20.ebuild 627 BLAKE2B 806f1be5a1487fbeba68548d7408602b6f6ec3a480c2cc7533961778588ca7cb4038e1aa36c5f04f918b3a2811843e5b4c1d2301f7d47d67d84f33867c0f1294 SHA512 235fe2607607bd5c8dcf2c2b1eb2efd8c40cf7adf7e99ddabe34d030bb0625ba8c2601d58b23f7456bb8ea899b390b045a25a0a470ed8543556900112ee1e1de
-EBUILD rex-exploitation-0.1.21.ebuild 620 BLAKE2B 984292005a3f0df2a33ca6d2aaee24a12713c729cefd61a09822e38e03792eaf1c2d22caa237eae1b7b64bdd7f28de732330ab0e086b3419f39e58af413d3fdf SHA512 2a6e818528c7cac394e5a10b3ebff6e7ca1d10b018c3cfe7f55ca61874607e896fa70745dd1ecc1256dede1daaa19c41d2dffa8c52ab8b97d98540180a3d7ec4
-MISC metadata.xml 405 BLAKE2B f814e2256b6d217a3ee4353eb07d5f5eda723cf7bcf06504ba34df7345584e1feb4320d445b5e5a2c91e9e86948291db47c06c60864954735181ef5bb790c993 SHA512 3af40e7e532b1d0c141aa419cdd5f10dc151c3406e90bc56e7e281a78e8fca7e8204213d6e0ffc6ed74ae4d0ca6a9bc79c5c4760be0406b0d89694d0299d5c85
diff --git a/dev-ruby/rex-exploitation/metadata.xml b/dev-ruby/rex-exploitation/metadata.xml
deleted file mode 100644
index ca2ed33abcc1..000000000000
--- a/dev-ruby/rex-exploitation/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-exploitation</remote-id>
-    <remote-id type="rubygems">rex-exploitation</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-exploitation/rex-exploitation-0.1.20.ebuild b/dev-ruby/rex-exploitation/rex-exploitation-0.1.20.ebuild
deleted file mode 100644
index 4ae9822adb15..000000000000
--- a/dev-ruby/rex-exploitation/rex-exploitation-0.1.20.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_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="various helper mechanisms for creating exploits"
-HOMEPAGE="https://rubygems.org/gems/rex-exploitation"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/jsobfu:*
-					dev-ruby/metasm:*
-					dev-ruby/rex-arch
-					dev-ruby/rex-encoder
-					dev-ruby/rex-text"
-
-all_ruby_prepare() {
-	sed -i '/bundler/d' Rakefile
-}
diff --git a/dev-ruby/rex-exploitation/rex-exploitation-0.1.21.ebuild b/dev-ruby/rex-exploitation/rex-exploitation-0.1.21.ebuild
deleted file mode 100644
index b729da79ae96..000000000000
--- a/dev-ruby/rex-exploitation/rex-exploitation-0.1.21.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="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="various helper mechanisms for creating exploits"
-HOMEPAGE="https://rubygems.org/gems/rex-exploitation"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/jsobfu:*
-					dev-ruby/metasm:*
-					dev-ruby/rex-arch
-					dev-ruby/rex-encoder
-					dev-ruby/rex-text"
-
-all_ruby_prepare() {
-	sed -i '/bundler/d' Rakefile
-}
diff --git a/dev-ruby/rex-java/Manifest b/dev-ruby/rex-java/Manifest
deleted file mode 100644
index eaa89a01e594..000000000000
--- a/dev-ruby/rex-java/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-java-0.1.5.gem 23040 BLAKE2B 27789a55c6922770211285ef665221c9619a956ea874534f029a450760fca8c5034a715d9aaf91864e624363efe5d9f966be7b00c5c7133284b0eb591034b36d SHA512 990f989a19cdb5c6f87ac5b57e500fa1bd7031dd867e43c6b451f538c1b581b57ee9908b40d8a37727c45883ba17f466272e739913ccc2406b69c1e818de5c7b
-EBUILD rex-java-0.1.5.ebuild 445 BLAKE2B 4da0c3a70a2889867368fc327b30877a1eda237ef1d98441349139a42e5f822c368bedc158299e63444cf6e9d85ccdc7cbacd23be9032ba541bd9b47c2a6d083 SHA512 1275fe4d6344c13a72da166ba4d7a83155ddb7bc03fd6e9fd84233dca8e990eed2e37a45338a57f2bc557d8918e4808d2b6d7e2ee38e3ccf4543cee1b0bd6e0c
-MISC metadata.xml 389 BLAKE2B bd09e6d2debc335faae3bb86ffb0f2cd04995182954de39f516b50237ab76fbf05269c2940c0814b65c067979b2095ab7712e8f83426e5381d951d0306a91f06 SHA512 ade2c3b7aa2a8162839d0d6adf1a5437559076611edf25d8bebb3d546e29873a79ec895dfc2615ad080d6e1728f20735a5718c49ae95bd18bb52dc7530cd43cd
diff --git a/dev-ruby/rex-java/metadata.xml b/dev-ruby/rex-java/metadata.xml
deleted file mode 100644
index 1d50cd098c59..000000000000
--- a/dev-ruby/rex-java/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-java</remote-id>
-    <remote-id type="rubygems">rex-java</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-java/rex-java-0.1.5.ebuild b/dev-ruby/rex-java/rex-java-0.1.5.ebuild
deleted file mode 100644
index 082e9586811f..000000000000
--- a/dev-ruby/rex-java/rex-java-0.1.5.ebuild
+++ /dev/null
@@ -1,21 +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_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for parsing Java serialized streams"
-HOMEPAGE="https://rubygems.org/gems/rex-java"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/rex-mime/Manifest b/dev-ruby/rex-mime/Manifest
deleted file mode 100644
index 39b2ee420037..000000000000
--- a/dev-ruby/rex-mime/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-mime-0.1.5.gem 16384 BLAKE2B 1c1cf22a8233420f8b29d8c58356192053f109c6372201ec8485261928ce32d7e65ac8395f7399ff4f1b64c6a5505f6fae35c2f263bfa7f55e25b784bbc3bf7a SHA512 695d2c411b26cbbd50ffa5b184ac464af2560b9e36d39c9c3ea17ceaf4e8d5052500162cbd9395259cc3c426df50a56c21c4d0f63e238e56454c6666c3d10b5e
-EBUILD rex-mime-0.1.5.ebuild 529 BLAKE2B 95b0e5b29c01018c2b4d76eadeef7b1c8f0cfc246ba4cf0e5a9c982aebdbc18372456cccaa43eaa9d9bd4c04c5258195a0967df9a678334555915d1ee88edcd5 SHA512 42df511ce79180caf37e0c890dedb59904240cf8833cc292441398809376bcd3d2078b45626a55a7549c056a1ab64040927e4f1e0644f4052f2369272a963997
-MISC metadata.xml 389 BLAKE2B 7fb4cb79ebb873da46fb80581ef7a2144a41d70085a2e48f8176da00ce4812e9a2561fd0fcfd5c4e05b8d161429cd171787f8fdac5e079df74f6d277f0f04c68 SHA512 ea6782e85b7b3f06cda1b8ad29203f9bc787728adbeb247ad210070c8200aab87c6789faf0f430d6aa0fcd5571c38eea751636759b500714712b8025ab93be6b
diff --git a/dev-ruby/rex-mime/metadata.xml b/dev-ruby/rex-mime/metadata.xml
deleted file mode 100644
index 8b25661ebbc7..000000000000
--- a/dev-ruby/rex-mime/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-mime</remote-id>
-    <remote-id type="rubygems">rex-mime</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-mime/rex-mime-0.1.5.ebuild b/dev-ruby/rex-mime/rex-mime-0.1.5.ebuild
deleted file mode 100644
index 7da5945b6b4d..000000000000
--- a/dev-ruby/rex-mime/rex-mime-0.1.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="library is for creating and/or parsing MIME messages"
-HOMEPAGE="https://rubygems.org/gems/rex-mime"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rex-text"
-
-all_ruby_prepare() {
-	sed -i '/bundler/d' Rakefile
-}
diff --git a/dev-ruby/rex-nop/Manifest b/dev-ruby/rex-nop/Manifest
deleted file mode 100644
index db45de06ee6f..000000000000
--- a/dev-ruby/rex-nop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-nop-0.1.1.gem 27648 BLAKE2B f0fc6452929255c9fe25af2045e72ac4f38540519a7e51fffad83613bf3886e1da3f7c8949c1d6668e4483eb58e48a2f68d0517c366c49c5c2da397577dc6544 SHA512 f0a80f948189eb3c775739e7a492882ed7a647f9a79d1cfe3658f8905b8316a386dd0c89da5158eaab351f6122bf5bbb0c8270424617940fe48a1270cb363da5
-EBUILD rex-nop-0.1.1.ebuild 533 BLAKE2B 7c670a772ef446bc96a3737382345deb728c98db5e52040203ed142d39eacf6946f184c0c35f5d75fe3e3dbe1e916f95c662893a1634f4587b0bd3c7456edd2d SHA512 23561968f167b7620022625ab38aca3d18757f4c6d3dc46396591c5c7a5e81537c5cc0d541178fee7b012c8aba81dafbe9a9bd008de7ba3cb774a63b6858b4c6
-MISC metadata.xml 387 BLAKE2B e373692fb9da0863eaa831b5a51d7bd172a65c0332365dc000a67567a0bc0038cb7a61bd11df82f8159ccf3c123599e7fbb89abf84970d48a64ec5fa38344689 SHA512 db3deefc5b999d85a23c4b4ac3f77175ce26976921ef937117ad2b653ce10a324668a78d1e5fa3b0cf49d3013387f1f6437f9769ff4abbd7e310dde9646cda55
diff --git a/dev-ruby/rex-nop/metadata.xml b/dev-ruby/rex-nop/metadata.xml
deleted file mode 100644
index 543564f42dd4..000000000000
--- a/dev-ruby/rex-nop/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-nop</remote-id>
-    <remote-id type="rubygems">rex-nop</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-nop/rex-nop-0.1.1.ebuild b/dev-ruby/rex-nop/rex-nop-0.1.1.ebuild
deleted file mode 100644
index ee3c4ed0c561..000000000000
--- a/dev-ruby/rex-nop/rex-nop-0.1.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rex library for dynamic generation of x86 multi-byte NOPs"
-HOMEPAGE="https://rubygems.org/gems/rex-nop"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rex-arch"
-
-all_ruby_prepare() {
-	sed -i '/bundler/d' Rakefile
-}
diff --git a/dev-ruby/rex-ole/Manifest b/dev-ruby/rex-ole/Manifest
deleted file mode 100644
index 1847c440c70e..000000000000
--- a/dev-ruby/rex-ole/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-ole-0.1.6.gem 26112 BLAKE2B 1812b3f3c9b0b4f115efd66d1fa29cb39370e58e780695127390987dbb4b87647f2e0744b88ba4ee7b9ed7857155c8f1d32dbe6d090a7d3166ae5928d18686e5 SHA512 5fae70ec85058e3dca08fdedd595fb27b46de263aa727fd291606d4f8f226bc0d9a2f135bf4673a8e389d6a2e932e7514eb97954f765c1ce9401233ac2cd7da1
-EBUILD rex-ole-0.1.6.ebuild 492 BLAKE2B cb76f2855757747218f2163ee4cdc804a47c812d6f179dbc9828087af8890117a3ab0b32970c1e046df7d52569015d06e5aa4d64c8cbe966f798797e46880c2c SHA512 f85d743036c7f6aea7019263c91cfaad91379593227ffc96037048842583ba44304e93e8877c9b8426ada94cfef0be21e90692370c6ab8bddc2e94da75e7f9d2
-MISC metadata.xml 387 BLAKE2B b888d7a5a8d64ced8d3357ff94fced377985149874143f636d22eaef6861f27444d49db5db80f3d0cb600e5cd316541b23a47b7a947be387a93c217c82aae7fb SHA512 d215a2f100976cc348cc12b109f564c1101ffc76826647a20ab5df0529dfacb5eccd81770bb716b509de7dd232faa2c5ad275bbf33607725a6dad3f83d6deac1
diff --git a/dev-ruby/rex-ole/metadata.xml b/dev-ruby/rex-ole/metadata.xml
deleted file mode 100644
index 07c44cdc9792..000000000000
--- a/dev-ruby/rex-ole/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-ole</remote-id>
-    <remote-id type="rubygems">rex-ole</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild b/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild
deleted file mode 100644
index f449feca15c2..000000000000
--- a/dev-ruby/rex-ole/rex-ole-0.1.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library gem for reading/writing OLE files and streams"
-HOMEPAGE="https://rubygems.org/gems/rex-ole"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-powershell/Manifest b/dev-ruby/rex-powershell/Manifest
deleted file mode 100644
index 5f8341eedbef..000000000000
--- a/dev-ruby/rex-powershell/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST rex-powershell-0.1.77.gem 28160 BLAKE2B d1fb9f6e9f66e6b55b09bdda329037ea7da135b9eaec9f1437ca374f3be5da1b5ee63f7c92d56447c88964a4c1a4bef68b2d6b64a4e507b7c2a7010f1ff09d40 SHA512 99e3a8394c580b07580f8c230f049b15fd80b02db4b940208a1086e1c3d679ab1b757fee56356d6b25a6876ccb21c50d1037b7bbadc486a7c38b10b9b81a09d3
-DIST rex-powershell-0.1.82.gem 28672 BLAKE2B 108ef69d9cf09c8fa44efaa360712448b79b694012116a35ad5bda6cdcb6351fa26ad274343176a1e5bdb5c78d9187526dedde83ec2071bcace33ae16ffd8b28 SHA512 a6c8436f131d04561324172adcf91f2425a375703b731a1f817ddcbece292ecc8cd6ff3af1de6d94cee05fef27a7adef51fe9edc25825638fdeb89b501f3fa55
-DIST rex-powershell-0.1.83.gem 29184 BLAKE2B 11ec112b75a08d76894eb55ae039179cb538e6bc35c49df893f936402d96b5fa07a22d464e256bacf857a5b4ee5130b8c7124ec9eeb32553ee26c0ea18642049 SHA512 667f916d71fc7caa1284f5741c9c3c1b07c4ffd2583fc44b17b94947bc4f0a19bd9c331984f0a5cd0dbe9df12ebbd7b0529cae1715886c0475f88f2a9fc5b268
-DIST rex-powershell-0.1.84.gem 29184 BLAKE2B df9acd9cc9f545be6649bef771d52a6624ac5cd343b8f2918bbc95b5833c8f9ed00f462fafe1af78969ae1b6b53e44fc48703da0d1f024a7e29ba6463679e9f9 SHA512 f30eb1b4a811169867dc14f7994405710748500fd4cd2a2a5508f2522de082f0db53ec26bdf4bd3bc5ea5bf09834680e32b105899a7db5dd358414641ea13e8d
-EBUILD rex-powershell-0.1.77.ebuild 537 BLAKE2B 3db094c5379606ab5db1b8e006f45ff14832611f640478af83e8620eecb6336f40c5de9547b1585f6d2a26b1a496452cd3549d0dd7be778bf466f28b01301047 SHA512 30f79caa12c09d40f493cba08cc85695a6d14d1bfad439cfeb7a81d7fab44f8145db7ef1a104b05880f14cdc3cd2c16f477a3e0736e7642864311fe07ef4f7eb
-EBUILD rex-powershell-0.1.82.ebuild 534 BLAKE2B 2384ba6c19029d01350e4374275f23d541f9640c5a041690a878c440c901f7db66fa850d7fd03e4dac8d95bb6db6961724e9cb0829850dfc7d2af1afbfdc3840 SHA512 ec386a69b3cab29f1b09e0c3b6fd2efb392910e6431e0ccf99d8442ef2786fc5fa6d70a32c4a2d113245a11cc9d4059a427363ddd0039ab3eb1c45915d72346b
-EBUILD rex-powershell-0.1.83.ebuild 502 BLAKE2B ab7cba027a99c7bd9b8c578be2b444b93e658c6630cc587cbb7be95cb1cb2403cc369847e4b02a506a45705e977d3051467ad87ac81f4aac2bc05a365a139805 SHA512 16f2547ae260e2916252dc0b835c65c8cdb6f02f9ae8cde1afae16c336d3b6d78477cfafc59e2bbafd4a671c4f8c48e1499212fa88e8f0e1b245e2c91f864692
-EBUILD rex-powershell-0.1.84.ebuild 502 BLAKE2B b10aec69a59bf9ae2c93c4d757e09256006df1520b82657696af0dafb01c40309dc7a40a29c2ed323800768f592f1fd686d0c5f1677b3fd0d5cf8964dd5218d4 SHA512 366c80b6ca85b80f63fbe22ba6193d73645304b963f14e11729e6b6e642c286c73615b2a4698c987647cacd7178068d416c68f5065d9e3eefc609d5eda038e25
-MISC metadata.xml 401 BLAKE2B 9ced95a371f0f76b272ae92fdb6955e87481fe0e5054d87ead013f86a91e83573aac67611acb9da9c765b8e6970a71cc99714ce9e6b0a52d66f7da5f2a365134 SHA512 1960bdc2bd8ecd7b03969c7dc24374ea46e45a7b7218c7d5f0677aa6906e191908416919302f5d9082c35021d7be414040852c33e457eb6d8ad5030e95b4bb52
diff --git a/dev-ruby/rex-powershell/metadata.xml b/dev-ruby/rex-powershell/metadata.xml
deleted file mode 100644
index 48105fc5a97b..000000000000
--- a/dev-ruby/rex-powershell/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-powershell</remote-id>
-    <remote-id type="rubygems">rex-powershell</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.77.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.77.ebuild
deleted file mode 100644
index d44f1014de16..000000000000
--- a/dev-ruby/rex-powershell/rex-powershell-0.1.77.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts"
-HOMEPAGE="https://rubygems.org/gems/rex-powershell"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-random_identifier
-		  dev-ruby/rex-text"
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.82.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.82.ebuild
deleted file mode 100644
index 4313ff18634e..000000000000
--- a/dev-ruby/rex-powershell/rex-powershell-0.1.82.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_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts"
-HOMEPAGE="https://rubygems.org/gems/rex-powershell"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-random_identifier
-		  dev-ruby/rex-text"
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.83.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.83.ebuild
deleted file mode 100644
index 557fe82af21a..000000000000
--- a/dev-ruby/rex-powershell/rex-powershell-0.1.83.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts"
-HOMEPAGE="https://rubygems.org/gems/rex-powershell"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	dev-ruby/rex-random_identifier
-	dev-ruby/rex-text"
diff --git a/dev-ruby/rex-powershell/rex-powershell-0.1.84.ebuild b/dev-ruby/rex-powershell/rex-powershell-0.1.84.ebuild
deleted file mode 100644
index 23c8eafdb298..000000000000
--- a/dev-ruby/rex-powershell/rex-powershell-0.1.84.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for generating/manipulating Powershell scripts"
-HOMEPAGE="https://rubygems.org/gems/rex-powershell"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	dev-ruby/rex-random_identifier
-	dev-ruby/rex-text"
diff --git a/dev-ruby/rex-random_identifier/Manifest b/dev-ruby/rex-random_identifier/Manifest
deleted file mode 100644
index 6ab7135538fc..000000000000
--- a/dev-ruby/rex-random_identifier/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-random_identifier-0.1.4.gem 16896 BLAKE2B 37c1011b91dd16a82c0ee8ff1c96b0263c4842503826bae327d3a6d3b61dac77620cbd28cba350c0cf56bc5fc480bc37663a78674d0c7c8d8d6bb95e046e9559 SHA512 8e302a511a0540f826ddfa6e51c5b29da0c42ef6bd3dc433d6624688efba245c1df3903dbf37aacaecdd39b53f721e3d6b4fa8247f8cd31e7679ff96293094f7
-EBUILD rex-random_identifier-0.1.4.ebuild 575 BLAKE2B 01292dc7db1fa5d758d5b87c4c2ffd9667590ae75e0faf98350a82b1bb0186af4c4d8ea3a2690c96159db76a4e8ec53a55bf51eb12e38e40478ceef7eb31a90e SHA512 00118a63a0d51c7ee1cfb3da4cae839398f709065ee7d337623166f9f7f5a189ffde485e639d8593625c171ba79f051ecd288f78c31156ac4dc75e2f5f08e668
-MISC metadata.xml 415 BLAKE2B 4ad85703d580032450110f21f844d19374c9104ad88b215d70688e8bc6b175c5d706a1afd793196440a1ae39dedf9342c19d34a0c295604d3f15ef112261a9e3 SHA512 9da0baa565c2f611e562aa78eeae7755603721a3d934d63552b8858efda0d379b2a479735d256b318a440305363776b8f4f352ff10201be2dd0397bd38cf0abe
diff --git a/dev-ruby/rex-random_identifier/metadata.xml b/dev-ruby/rex-random_identifier/metadata.xml
deleted file mode 100644
index b1f9fbc92743..000000000000
--- a/dev-ruby/rex-random_identifier/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-random_identifier</remote-id>
-    <remote-id type="rubygems">rex-random_identifier</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild b/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild
deleted file mode 100644
index d59ef975207f..000000000000
--- a/dev-ruby/rex-random_identifier/rex-random_identifier-0.1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# Upstream has specs but they are not released and upstream is not tagged
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for generating Random identifier strings"
-HOMEPAGE="https://rubygems.org/gems/rex-random_identifier"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rex-registry/Manifest b/dev-ruby/rex-registry/Manifest
deleted file mode 100644
index 1df8ea7cbab8..000000000000
--- a/dev-ruby/rex-registry/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-registry-0.1.3.gem 16384 BLAKE2B 9db5f9674b8d341797ea797f5c5a1e43900f6f4c4e563658fbe55fcf43ba1126067d0e822df3cf21695143bd70309d7499d708cf48b80e6c903e06e7d0e8acfc SHA512 cde5350945e8aa7cfa0dc01c78e7a375d1aa7174c2954b658ffeba39c81d638b1d614866cbd0f8f8f417f1831281cd43126cde158944903e36c8dc5ce79773e6
-EBUILD rex-registry-0.1.3.ebuild 532 BLAKE2B bb18f1986f9a805b6509c3f5a9a8f83272db1a8faf74fa56bcea8f2e9ee4497ff21ea95a46fc08e768e51b1002bd2bd23557262f7365edaf6634e41265191c69 SHA512 b7bedfab877084f3bb9489593dfcc47d48a62ba97b1645489b1b4fd5688d5b0f1cb0e320958da3399504eb2b3db894361cea41a9d48491a2e33654b385f13bb0
-MISC metadata.xml 397 BLAKE2B 9f1313db54d7a221e512cc9c4d1d4f02f48017a2414bbafa03192638203c37fcb29a5e9b8c20f1ae79c3956a3d30813ea391ed463dc8f18aca014cced68b046e SHA512 e011f42529d96ffe371032139c75c3d5521d9500825862cc93430595a25d9ddf2971488101923993f179036d54cfd44ddf63da98c9eab3803fd27a4f4fe7b782
diff --git a/dev-ruby/rex-registry/metadata.xml b/dev-ruby/rex-registry/metadata.xml
deleted file mode 100644
index 0cc60f7b4ffd..000000000000
--- a/dev-ruby/rex-registry/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-registry</remote-id>
-    <remote-id type="rubygems">rex-registry</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild b/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild
deleted file mode 100644
index 56c2a97dc4af..000000000000
--- a/dev-ruby/rex-registry/rex-registry-0.1.3.ebuild
+++ /dev/null
@@ -1,22 +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"
-
-# Upstream has specs but they are not packaged and upstream is not tagged
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rex library for parsing offline registry files from a Windows machine"
-HOMEPAGE="https://rubygems.org/gems/rex-registry"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/rex-rop_builder/Manifest b/dev-ruby/rex-rop_builder/Manifest
deleted file mode 100644
index 9d378a144f09..000000000000
--- a/dev-ruby/rex-rop_builder/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-rop_builder-0.1.3.gem 17920 BLAKE2B 065ab39805966db515da08a1c321cde39e07b140aa58c48eaeba15ba12d6ae9da6455d924aff3355fe1c89d1b0ab54704f18b60cec13f5267e9f6b7bfaa0b312 SHA512 c01c82761bd317fcdf0de4cd03b834c3e3d2638a9bf72e7c47643fc8faab179dfa639b319fd1de7691d0dc2ccb7578bebbd567e03e8efe24553cc481456ad4d6
-EBUILD rex-rop_builder-0.1.3.ebuild 562 BLAKE2B 1016ca9cef9188e30071165f05250e5bbb889d08f28971f770193aff2ebe3937d5fa8f5e032b41fbd3d03bac0cb1bd05c3b7be06c12f368c5d50be3b953c2d6c SHA512 87bf1bafa6aabdf6e5028ee35dda2e84ef67afd9b6efaa3cd51d439fc600933d4ef0cb584e71e6aca2d667c121dc556906857c36b8de2a99acf82d2d5c5994cc
-MISC metadata.xml 403 BLAKE2B 9a5c794632db50243654e3b68165492bfb92ba003f4985c9ab5bd508b483425abdce6c74435f7c39602aede5f44f80f2817c5fac80e609e3705a57ce33e8b014 SHA512 e96dbda4584d3c4057cc8a20b0d39240fffaa9aa01449658c8d32b09e76e8f0c2242d075278ff330a6c0a3564e85382b8972eddefc7caa682d3abab0d208c253
diff --git a/dev-ruby/rex-rop_builder/metadata.xml b/dev-ruby/rex-rop_builder/metadata.xml
deleted file mode 100644
index bbcf71b64dde..000000000000
--- a/dev-ruby/rex-rop_builder/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-rop_builder</remote-id>
-    <remote-id type="rubygems">rex-rop_builder</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild b/dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild
deleted file mode 100644
index 776b98e5c24c..000000000000
--- a/dev-ruby/rex-rop_builder/rex-rop_builder-0.1.3.ebuild
+++ /dev/null
@@ -1,29 +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_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) Library for building ROP chains"
-HOMEPAGE="https://rubygems.org/gems/rex-rop_builder"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-RESTRICT="test"
-
-ruby_add_rdepend "dev-ruby/metasm:*
-					dev-ruby/rex-core
-					dev-ruby/rex-text"
-
-all_ruby_prepare() {
-	sed -i '/bundler/d' Rakefile
-}
diff --git a/dev-ruby/rex-socket/Manifest b/dev-ruby/rex-socket/Manifest
deleted file mode 100644
index b21ca334fe98..000000000000
--- a/dev-ruby/rex-socket/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST rex-socket-0.1.17.gem 40960 BLAKE2B af549e3c6bc6ab8f99a18eab8f8be5156211be468f4d55e234199d5b5985a8ac11817f245a6bafa421c0b8c908cfedf7e58503157c460fee76ec989ff628a8bd SHA512 2d7dc563d24ef99930ad6fc62ce69ced2a7d2cec881222edf889c6850b8ce48a49eb435acd1bd57637d07ab0434032e44084dc86d18a52c33c3f8df57928958e
-DIST rex-socket-0.1.18.gem 40960 BLAKE2B 0e38d508d11ff03c3e658935d2f569d40b5460a259b86f08250893a5a111da1580b2badc4ed45d9db8fa737d7ffb4639a312af683539b6eab2e8fab18fde5297 SHA512 74568a58434b784336bdb99ba7ca43ff84ced905f7d7d165eb9e2eed84076c49710f9d09dfaf3aa65fa672a7bbc177ff9e6c3e3af4d7001576f3c1430b714461
-DIST rex-socket-0.1.20.gem 41472 BLAKE2B e0a5a0dbf7ad663dc69dddb1de0d7e77b3c8cca374d73499616bb23c8d86fd23c65f7d548bfad2c8609b13e8ab89004f51d6e08865e26b1184176fb9c4228df6 SHA512 eae98bb6be13291ea31ff98fa55d86d67feb06d3796ad3bbdb9fe90503a296ceaf7f702e0ade64f7dd152be7de0eaf313a6ab9d982678d7d60d982b9d23fac51
-DIST rex-socket-0.1.21.gem 41472 BLAKE2B d294df648995102aa5fa0119682321b6e4c8985a46b2521afbf3f53cf0b4e1c209f57a6b7ba0ccbd4dc46175baec4812afe656475c13bc62407d54142a548ad0 SHA512 64e133308b2bb52e6b8ee00da7788c0c5583bdeacc78017b30ae458a487e991aed3196a2371f883e10a7c2774b24d7571e7c3051b97b8424b470f00085ccf868
-EBUILD rex-socket-0.1.17.ebuild 469 BLAKE2B d7cce4d8f62c31881fc345a96a572ad53c6953bfaf0c2649a88784108bb377d7543ffd23763fc8455e75a5f1890d6120c550c55299c2269ba333dd5eeb134c02 SHA512 d5fdc53a71126ab623066b3b457c51a9a2bb2ad0ac81f1dcb0a24bc3e23ad99ebebab57bed681b9ef0135a15faf50dfb23fd742ab75dcd1d83f5f37a127deb9a
-EBUILD rex-socket-0.1.18.ebuild 462 BLAKE2B 4185c2e36ef1292d4ed0c8e0f677ee11cc982b056b851593ff1eb34c6e4d77f0884a8a95c84cdf29126a75ca23eb9112d9a7b2fb697476eca8eb2d030481e75e SHA512 7302e487110a5558c491da591e762400d0af703a81cf6216dc48a979f34a09b1d09157c3ebfd5c2966b28faac538c46fade8e91f2f6725e775520f887265f85e
-EBUILD rex-socket-0.1.20.ebuild 437 BLAKE2B a617d957fc90d5e3952c335c66dc6814e3d43f92c6df61d25fce9093ede84320ff24831ada72362a5ddcf224117eb8943c1832981bb8fb83f8d72df1c639dd3a SHA512 d0206882fca0c1992c8d3694d49b6cda1ac3f9008e81c97e5bec7c10c8e4d350e9700a0befe44b863f73699bf410a16de51791359e145278c7607720d20caa7f
-EBUILD rex-socket-0.1.21.ebuild 437 BLAKE2B a617d957fc90d5e3952c335c66dc6814e3d43f92c6df61d25fce9093ede84320ff24831ada72362a5ddcf224117eb8943c1832981bb8fb83f8d72df1c639dd3a SHA512 d0206882fca0c1992c8d3694d49b6cda1ac3f9008e81c97e5bec7c10c8e4d350e9700a0befe44b863f73699bf410a16de51791359e145278c7607720d20caa7f
-MISC metadata.xml 389 BLAKE2B 544f3d8d83c609027ede420284a2872d974dff70a2da51590de644432807e6d4e5f0f466d6928ef4f519d5537f368e70149db370bf4051c85980cfc25d34b6a4 SHA512 d2b55e0366bd178ca9117f1768f939af7a8967b8f02244bed2839b69f4f5ef8a8d6f13b1d6014c8f2ef20dff7c9def63592c80c2b934b172103ace300b441a15
diff --git a/dev-ruby/rex-socket/metadata.xml b/dev-ruby/rex-socket/metadata.xml
deleted file mode 100644
index 84171b9257ef..000000000000
--- a/dev-ruby/rex-socket/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-arch</remote-id>
-    <remote-id type="rubygems">rex-arch</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-socket/rex-socket-0.1.17.ebuild b/dev-ruby/rex-socket/rex-socket-0.1.17.ebuild
deleted file mode 100644
index e5f80844af5d..000000000000
--- a/dev-ruby/rex-socket/rex-socket-0.1.17.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation (Rex) Socket Abstraction Library"
-HOMEPAGE="https://rubygems.org/gems/rex-socket"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-core"
diff --git a/dev-ruby/rex-socket/rex-socket-0.1.18.ebuild b/dev-ruby/rex-socket/rex-socket-0.1.18.ebuild
deleted file mode 100644
index 968617f5cfcc..000000000000
--- a/dev-ruby/rex-socket/rex-socket-0.1.18.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation (Rex) Socket Abstraction Library"
-HOMEPAGE="https://rubygems.org/gems/rex-socket"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-core"
diff --git a/dev-ruby/rex-socket/rex-socket-0.1.20.ebuild b/dev-ruby/rex-socket/rex-socket-0.1.20.ebuild
deleted file mode 100644
index 70cf8ff242f7..000000000000
--- a/dev-ruby/rex-socket/rex-socket-0.1.20.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation (Rex) Socket Abstraction Library"
-HOMEPAGE="https://rubygems.org/gems/rex-socket"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-core"
diff --git a/dev-ruby/rex-socket/rex-socket-0.1.21.ebuild b/dev-ruby/rex-socket/rex-socket-0.1.21.ebuild
deleted file mode 100644
index 70cf8ff242f7..000000000000
--- a/dev-ruby/rex-socket/rex-socket-0.1.21.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation (Rex) Socket Abstraction Library"
-HOMEPAGE="https://rubygems.org/gems/rex-socket"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rex-core"
diff --git a/dev-ruby/rex-sslscan/Manifest b/dev-ruby/rex-sslscan/Manifest
deleted file mode 100644
index b7647a6301dd..000000000000
--- a/dev-ruby/rex-sslscan/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-sslscan-0.1.5.gem 17920 BLAKE2B 735fc522593cc1caf41c5000232afa64e88a9be83cb756b91d662b9bc8ed1ca81b1a2302325a687e851b22d7914b66fafbf7d18fdf3ea3562dd25b64543c0383 SHA512 05c7606c722fad7be5f21f28de34de23882a31bf4fde1000f11d556740b14102e495efd0bc3ac478aee64ae417e761ce9b5ae80f1c10f2410828610611fc3dab
-EBUILD rex-sslscan-0.1.5.ebuild 526 BLAKE2B 99f858d557866efd8ee60616076cc1c9715bf1b70cf6b0c8298076d0a1fb226960f729a8d54916c9545985084edbf372457448b99e242557e7b5f57a99cb6f0d SHA512 9ed5e3d1be2f146e9fe389e23a11ee79010dd990f5f7454a8e83cd3a6797f3d923dc5fbac201357e2360425eaed08ec4422c5c474da25ac71a9ce857177d46b7
-MISC metadata.xml 395 BLAKE2B e446728b57826329bf8900561263f65f7c47d085a134780f4bf4b0ddb146999a7ce0c10aaeed2c06fab41bc21f0a029108a48a8c9d56a32d1378d34ae8bc9804 SHA512 75cd04b87c0234b1e4a415f9537a6f8a6ddde8314ce2e442402035fa6bfcdbbfb1c6248cd7574821e79597807b524143112eefe50dcc74def7cd9c7db3a1ecdb
diff --git a/dev-ruby/rex-sslscan/metadata.xml b/dev-ruby/rex-sslscan/metadata.xml
deleted file mode 100644
index b818a2e1a186..000000000000
--- a/dev-ruby/rex-sslscan/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-sslscan</remote-id>
-    <remote-id type="rubygems">rex-sslscan</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-sslscan/rex-sslscan-0.1.5.ebuild b/dev-ruby/rex-sslscan/rex-sslscan-0.1.5.ebuild
deleted file mode 100644
index 78e5105a29ef..000000000000
--- a/dev-ruby/rex-sslscan/rex-sslscan-0.1.5.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="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby implmenetation of the SSLScan tool "
-HOMEPAGE="https://rubygems.org/gems/rex-sslscan"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-PDEPEND="dev-libs/openssl"
-
-ruby_add_rdepend "dev-ruby/rex-core dev-ruby/rex-socket dev-ruby/rex-text"
diff --git a/dev-ruby/rex-struct2/Manifest b/dev-ruby/rex-struct2/Manifest
deleted file mode 100644
index 37d89bab76e6..000000000000
--- a/dev-ruby/rex-struct2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-struct2-0.1.2.gem 18432 BLAKE2B 1ff9196e38ae67b87f4348394da3b05759548dbfa29b8e1a4a891a02cc75a1e02b890bf3a53bb7f274f9a5336aa46330efc38dcd50fa5da25e74392bc78a2b91 SHA512 c8b549c89e5b884a6ec6ef9a04dd2a3400bfeb885b742f1bc256a200387bcbd8ba848ad1e69a4c0c349516a62c04067a8bbffff04cb5c581f51d0ff91a142e6b
-EBUILD rex-struct2-0.1.2.ebuild 511 BLAKE2B 28696d379bc77923f1393b176e1246bff5f8290697f9c2a5229d5a764d06e43e1d44f8ae6d167a329170b545ca08ebcad0a7e4b31a17f9fc6e082173de7b6a63 SHA512 42430b5c1856e7a614fa019d341577cf4c5e3a98d68e9eaffef9576d5dd828940ea0dfaa18fcd730c9722cca913c73c6e484e31291dcbf53d621548c9aaf1de6
-MISC metadata.xml 395 BLAKE2B bba037386792b3b940892cdc151b101878c5808c894ee42705daf52cc02311ab791f0509488aba1f5644a5fcb10d8f3da02d3bb201fef34edd4972f2eafa25c1 SHA512 5123190d580497055ed2f29dc79a4f6c5a21e62cc95c90e25e6ceab1a62d08faf8d766334b1d306052d6543c6903b665cf45b17ca17fd5731d93fd0341891148
diff --git a/dev-ruby/rex-struct2/metadata.xml b/dev-ruby/rex-struct2/metadata.xml
deleted file mode 100644
index 6337b9706e53..000000000000
--- a/dev-ruby/rex-struct2/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-struct2</remote-id>
-    <remote-id type="rubygems">rex-struct2</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-struct2/rex-struct2-0.1.2.ebuild b/dev-ruby/rex-struct2/rex-struct2-0.1.2.ebuild
deleted file mode 100644
index 0326cbd303c2..000000000000
--- a/dev-ruby/rex-struct2/rex-struct2-0.1.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# No tests in gem and upstream git is not tagged
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for generating/manipulating C-Style structs"
-HOMEPAGE="https://rubygems.org/gems/rex-struct2"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/rex-text/Manifest b/dev-ruby/rex-text/Manifest
deleted file mode 100644
index cb2c363fe864..000000000000
--- a/dev-ruby/rex-text/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST rex-text-0.2.23.gem 44544 BLAKE2B 4871d7869e11b5d450704ee0e19da1fb468cb6870569c41141b4a51a4ce267304ff0404d76d96b54b1a403d59f7efa724f60e16ef032c539a4cec56c0596345e SHA512 9dfa878a5da627ee10497a5f6ba9b8f7c63f649cfbd5b4a140b79ec9a98c65732e01f9938dfad2ff009296c42108b37d0df794bf40cb1741f3881de7d954d16f
-DIST rex-text-0.2.24.gem 44544 BLAKE2B 7da2f0fa33adf9bdc409f91288f47dc481a732159473f0a901cdbe5f4a8b8669d6bf96bc77603c0179d113b755472e13bd19d92ed74c2f25a187479dedb978fd SHA512 06da127bff8c3addf4e6a914d8e358658bc785776efac036518547f69389aa9a1ce314fce5ab3148453b6a9e3593a2f291d26ad0fa2bb4687e31e6078c594f9a
-EBUILD rex-text-0.2.23.ebuild 465 BLAKE2B af54914b76f327fd6f052bb9cb136ded08d770063b94a0b02dd3332b61f7c438aa5a4404226e16386676a55340f619ec766ff3b8a47db7d3a3636cb8f1e708c9 SHA512 9ea6383b94ffd76e1b78da784e8d828f9a8e9beae885d8dcbcb47937c6843918f00ca5a28813d4f3b57c023a11d7872a808d01a6bb266a32d1b94b592c408ed1
-EBUILD rex-text-0.2.24.ebuild 472 BLAKE2B 82ea60f22ebdc19b87e7d174089ca6b20af2b556b87b65a83217efef863e81108d53b885a5c073cba3c4367ea3eed6c3d5fc6cd7b251626a9e193d31688085ec SHA512 57f4a991cd4a01ea30918913e2ae763f4ff4e7b7f9b4327b28be3d63202a9356ca40e6910e0957fa2bc6201308c8c85d84cb61a8269603dde3705c8115bf069a
-MISC metadata.xml 337 BLAKE2B 5309d74f65e9d31fb44761ea01a28cddc4a698ec2700bf2a18806871b42370d931405eaa6a2c8093d7405de11defe6aedaeeb72ea585d7cfefd970a323cb82e1 SHA512 24d194089e40848fc1ccce781e29de3bbf56c536a4f5fea036d2bd783483d2018b1105a4be88b8fcd57408651d3cac45ca649a111364dcdb834014bc6bda7bb8
diff --git a/dev-ruby/rex-text/metadata.xml b/dev-ruby/rex-text/metadata.xml
deleted file mode 100644
index 47170675ac16..000000000000
--- a/dev-ruby/rex-text/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-text</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-text/rex-text-0.2.23.ebuild b/dev-ruby/rex-text/rex-text-0.2.23.ebuild
deleted file mode 100644
index 26a1fd1912d7..000000000000
--- a/dev-ruby/rex-text/rex-text-0.2.23.ebuild
+++ /dev/null
@@ -1,22 +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"
-
-# Specs are not bundled in the gem and upstream source is not tagged
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rex library for text generation and manipulation"
-HOMEPAGE="https://github.com/rapid7/rex-text"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/rex-text/rex-text-0.2.24.ebuild b/dev-ruby/rex-text/rex-text-0.2.24.ebuild
deleted file mode 100644
index 9bb90f2f91da..000000000000
--- a/dev-ruby/rex-text/rex-text-0.2.24.ebuild
+++ /dev/null
@@ -1,22 +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"
-
-# Specs are not bundled in the gem and upstream source is not tagged
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rex library for text generation and manipulation"
-HOMEPAGE="https://github.com/rapid7/rex-text"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
diff --git a/dev-ruby/rex-zip/Manifest b/dev-ruby/rex-zip/Manifest
deleted file mode 100644
index 2c9741c233e3..000000000000
--- a/dev-ruby/rex-zip/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rex-zip-0.1.3.gem 23040 BLAKE2B bc823e7d53c8a7245d568ee2cec013e7bf8b7c508409a0668481e323ea5343230c5bc64a7173f48a7ff966d6af5a9e50e3a0e2d64dec06a699923dc3182a89a1 SHA512 f92d64779ddf943ca4855c5b9c567a0d995ebb6ace93ac8da12a7f1dc3ea350d492d3d229d3950ffec32bbba29fcd226c27a5be81e3f45d6f0edaa35ebc70047
-EBUILD rex-zip-0.1.3.ebuild 568 BLAKE2B ff5fb36e3ced41adfa970daed380dbcebdcb86014f0c473ee76d94088804373a7b15b688657a22e37159bc59af235ccd077f4e4b44c4f491924d1805e4f40d0f SHA512 971bcb08c198e5395d6eaa1f1e7b10044dc6fc181c2d8a16ab790ec33fc0ee596834147cc7d170386e79de9df47ddcd251954e4f5a7b7e8180e2157210867260
-MISC metadata.xml 387 BLAKE2B 0e3ac5ec5b97816fe3a588ab5a4f19d8c456461c1cdae57b19c29cb58f49e2259dc7e2c708f4b7d9345e4c26d2b7e03648dd4fee009ca407ad5619fe72c53db6 SHA512 dd9953db84c05af8e5842ebac7f0419470d14fddd595175bc34467608f8d8fbf151f781c81455386718359e44a145f7d5def83b5e6ee7ae2d86cdaf580e701e5
diff --git a/dev-ruby/rex-zip/metadata.xml b/dev-ruby/rex-zip/metadata.xml
deleted file mode 100644
index 2c6f27eec48e..000000000000
--- a/dev-ruby/rex-zip/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>zerochaos@gentoo.org</email>
-    <name>Rick Farina</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rapid7/rex-zip</remote-id>
-    <remote-id type="rubygems">rex-zip</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild b/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild
deleted file mode 100644
index 8e4c1d256ce4..000000000000
--- a/dev-ruby/rex-zip/rex-zip-0.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# Upstream has specs but they are not included in the gem or tagged upstream
-RUBY_FAKEGEM_RECIPE_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Exploitation(Rex) library for working with zip and related files"
-HOMEPAGE="https://rubygems.org/gems/rex-zip"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rex-text"
diff --git a/dev-ruby/rexml/Manifest b/dev-ruby/rexml/Manifest
new file mode 100644
index 000000000000..b8b55cb24a00
--- /dev/null
+++ b/dev-ruby/rexml/Manifest
@@ -0,0 +1,3 @@
+DIST rexml-3.2.4.tar.gz 474955 BLAKE2B f0b9a2003b6dc2b90fbab9bac1b035ebeb89c57dbe9bd50514352a8bbb790593ba5eaf77a9c898de033b5721281a06be2fb4996fe2e5810191df015ede3e44d9 SHA512 8fb52814a93dac8e5e963b7e0686f63fa6c1a88f6842a4e401bde76acb2d85b874ed6243439921bb0cebf53a5b97e0b096424d736409240aa9a5224e617ee88c
+EBUILD rexml-3.2.4.ebuild 583 BLAKE2B f44629275b7c01f33a0481bfeebf1e45655512e3b2966e6cb9f09874f97a6196fa320ffd83011c50cb4e80bbd0144b79de7070872eb513687e2a97351e736a3b SHA512 42a3a84aa0eabe3ce9541a13484c803cd8c7be997168c4f4d0ee26af7f2f7e904aafa507b33d82b07df731e6275bf54349ba27fa68461cac29ce18223f5ee14c
+MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/riel/metadata.xml b/dev-ruby/rexml/metadata.xml
index f7b84e9623c4..3df5c34efc94 100644
--- a/dev-ruby/riel/metadata.xml
+++ b/dev-ruby/rexml/metadata.xml
@@ -5,7 +5,4 @@
     <email>ruby@gentoo.org</email>
     <name>Gentoo Ruby Project</name>
   </maintainer>
-  <upstream>
-    <remote-id type="github">jpace/riel</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/rexml/rexml-3.2.4.ebuild b/dev-ruby/rexml/rexml-3.2.4.ebuild
new file mode 100644
index 000000000000..7b10a9169511
--- /dev/null
+++ b/dev-ruby/rexml/rexml-3.2.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An XML toolkit for Ruby"
+HOMEPAGE="https://github.com/ruby/rexml"
+SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+SLOT="3"
+
+all_ruby_prepare() {
+	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/riel/Manifest b/dev-ruby/riel/Manifest
deleted file mode 100644
index ce83a80582d3..000000000000
--- a/dev-ruby/riel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST riel-git-1.2.0.tgz 436358 BLAKE2B 1ec3a3b8891ec4e108e3c7dff7061a36637827a8c4472d73da040da7850ffb55e9efae0022b3a51e8b0ccfec7424493769f1cf90513fdb4a95601e0bac3c9268 SHA512 d95261556756f32d8546e9fcd20a5cd7c1efde17c542dd3a1900eb282b2c43e2c74a069ecb860816e726f52fe26fb225a046e3e927f658bf1520510da8959358
-EBUILD riel-1.2.0-r2.ebuild 625 BLAKE2B 05688fdae5102601997175de0e367d74e1ab586d809d93c329aa2e17a382ca67e061bb26bf4dec65b584468509eefcada0a51c98ee6e2f23c1148b6713635419 SHA512 da6858b7e545587fbfb4b6537b0deb96169ce847bd59e44fb49b2297fded877681ef186ff067ac1fc0a3fbe7348cce7577c3cb93e0543cb7957fa3561655d41a
-MISC metadata.xml 336 BLAKE2B e2b9e1f7e89c66ec2a9e7a7269b48f0eb15c8ed0997e8287d1ae187d4be2e9a52e420de1a44cd13b92f9ec80748b5b6d9ea1237ccac0fdb4e28728f380f58aa4 SHA512 9ff8be1939525ea473bc5b870130a9bc0ac3bdd8c1ca8578ae476c71f6829f1698f646e5661c10a5fa55f6ed0608f7369acf8de24036ed98f5ae9e55c63eef44
diff --git a/dev-ruby/riel/riel-1.2.0-r2.ebuild b/dev-ruby/riel/riel-1.2.0-r2.ebuild
deleted file mode 100644
index b9e4619a1c97..000000000000
--- a/dev-ruby/riel/riel-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="Features.txt History.txt README.md README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This library extends the core Ruby libraries"
-HOMEPAGE="https://github.com/jpace/riel"
-
-SRC_URI="https://github.com/jpace/riel/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rainbow-1.1.4:* dev-ruby/logue"
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 2e38494a6b48..64cbb3adbcee 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -5,9 +5,9 @@ DIST rmagick-4.1.0.tar.gz 1977887 BLAKE2B 08d55b9bd154ced069dfd3bf58edd3d6ea9fb5
 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 1569 BLAKE2B 171845a5e99a0ec05e893c2cf72b17f1bbadca3edbf0803c6142b566cdfbccedc632aa7263f855a3156d4e991de4aae46105cec21879ff731f0c6ce81b2d7666 SHA512 fd37d1cc29463da7530e0fcde41a22e5aa036819234e97317b9dfb83548061055666ac5d9909527c9aeaaf556020280116db2e84b15dcb9c1d9e2ae82d272bd7
+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 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.2.0.ebuild b/dev-ruby/rmagick/rmagick-3.2.0.ebuild
index 7773ea1b09e6..0fc91a2a4dad 100644
--- a/dev-ruby/rmagick/rmagick-3.2.0.ebuild
+++ b/dev-ruby/rmagick/rmagick-3.2.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
@@ -15,11 +15,11 @@ HOMEPAGE="https://github.com/gemhome/rmagick"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc ppc64 ~x86 ~x86-macos"
+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*"
+DEPEND+=" test? ( >=media-gfx/imagemagick-6.9.0:=[jpeg,webp] =media-gfx/imagemagick-6* )"
 
 ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
 
diff --git a/dev-ruby/rmagick/rmagick-4.1.2.ebuild b/dev-ruby/rmagick/rmagick-4.1.2.ebuild
index 60b8e1d95093..476f721de9cd 100644
--- a/dev-ruby/rmagick/rmagick-4.1.2.ebuild
+++ b/dev-ruby/rmagick/rmagick-4.1.2.ebuild
@@ -27,7 +27,7 @@ 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]"
+DEPEND+=" test? ( >=media-gfx/imagemagick-6.9.0:=[jpeg,webp] )"
 
 all_ruby_prepare() {
 	# Avoid unused dependency on rake-compiler. This also avoids an
diff --git a/dev-ruby/roadie-rails/Manifest b/dev-ruby/roadie-rails/Manifest
index a5ff0ff358a4..50e438ba9718 100644
--- a/dev-ruby/roadie-rails/Manifest
+++ b/dev-ruby/roadie-rails/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..7d87cf6e720e
--- /dev/null
+++ b/dev-ruby/roadie-rails/roadie-rails-2.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hooks Roadie into your Rails application to help with email generation"
+HOMEPAGE="https://github.com/Mange/roadie-rails"
+SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+#RESTRICT="test"
+
+ruby_add_rdepend ">=dev-ruby/roadie-3.1
+	|| ( dev-ruby/railties:6.0 dev-ruby/railties:5.2 )"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		dev-ruby/rspec-rails
+		dev-ruby/rspec-collection_matchers )"
+
+all_ruby_prepare() {
+	sed -i -e '/codecov/ s:^:#:' Gemfile || die
+	sed -i -e 's/git ls-files/find . -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid already removed rails version
+	sed -i -e '/rails_51/ s:^:#:' spec/integration_spec.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rspec-3 spec || die
+}
diff --git a/dev-ruby/rspec-collection_matchers/Manifest b/dev-ruby/rspec-collection_matchers/Manifest
index 75d8fee93f9b..5e2a2663f5f4 100644
--- a/dev-ruby/rspec-collection_matchers/Manifest
+++ b/dev-ruby/rspec-collection_matchers/Manifest
@@ -1,3 +1,3 @@
 DIST rspec-collection_matchers-1.2.0.gem 17408 BLAKE2B 9ad83ec161d5cee74e6017a137c955a55262e05e4a82b14270887e0433b88ff3aec7245ea1a1707035dc6d2de19b2d6c27b952ad43882cc516a770bafd0b5a0d SHA512 0988cabcd8873cbb7161fda3500ae77ae299024a25a1f3faa71cad673777097518db5fddc9ff0ca8e25653c4e790b7ba76fe234596848816276defddef2e308c
-EBUILD rspec-collection_matchers-1.2.0.ebuild 550 BLAKE2B 7bc528fbf93c30bcf118ef97230ee8c60a9fbcdc7d528072976124b95743d60268b28eb7a222eac3b4313ca860888eea5766b21d7c6e0a3a0691f9f1165f4bdf SHA512 0215fbff131ec90f390074265ee24b6a0ca8911ab800b659d79c987fb7f6883367246a8dd5e4037351b3051bbb6dbfe32c9f46c42dceeaee5a7c98a5ab4fcbba
+EBUILD rspec-collection_matchers-1.2.0.ebuild 557 BLAKE2B 0e618f53d2d71fc4e5155487060bc04b822761102d4245cea586232b4bb8113fd977187d0c4125dcf84182f997fd734820fba3928cbb25e6085b8437058d5d55 SHA512 430391c2f92d1afd7f797ed2b91615f14a464190740ef03925a982ddcd94bdc3817ed9ce7b10b2da3011212f8d3a97446f870c2a7ff9dc7c770099d531c02c12
 MISC metadata.xml 357 BLAKE2B 1c9db582a7501475800f309d82f162a893ba12f4156a137e4a2b0143448808d066a614d3bad0f23ba8525c658e624b2e105eaf2617114fe03205ecd567aaaac4 SHA512 410f3c228f598963f872d5701edc301479eefdafc8a58b00c0d287bb6c9ba542dbed4d7a31c569500225d1e47150b431d6de6b26b02c7e9d7a8882e3d475be0e
diff --git a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.0.ebuild b/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.0.ebuild
index fe64925ba611..b4bec03062e3 100644
--- a/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.0.ebuild
+++ b/dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.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=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rspec-retry/Manifest b/dev-ruby/rspec-retry/Manifest
index 138942b5f8ac..e2183b0e36c1 100644
--- a/dev-ruby/rspec-retry/Manifest
+++ b/dev-ruby/rspec-retry/Manifest
@@ -1,3 +1,3 @@
 DIST rspec-retry-0.6.2.gem 14336 BLAKE2B f619f075c13f054dd73f893a37d2da644e4a77b2cdecef886b8fb2b8616b5c89b9aebb8506b94319e0873fd798c0361a8defeae9e651c1a17b9d2f7b26364134 SHA512 a14874f6589c78a00baf9d50d2415bd5533559457de313a5b56be77f4e226d8885f7e976bd6926b8be669f44ec672a6b16dbcf4dff26c26ca8eac64a25fd1b5b
-EBUILD rspec-retry-0.6.2.ebuild 653 BLAKE2B c7a4a8c0ff7ac29555083ccb2bc22c49be877e2a75b483c70cd8c3a977a80e7bfc5b7145a78d5460e28e2501c8693bd535a8feac26d626d1c3baa5ac6abbf016 SHA512 83f3d513d742741ce5177b469620cdbbd97794de98c6c670bd37d0f1e5f7c5aac305f5f8186efd0a9d6ba477564451eec6018a05cd3cdbe6bc1cc3518416b9b6
+EBUILD rspec-retry-0.6.2.ebuild 660 BLAKE2B 64e58faa2589c3f5df3887ce4891994c6c24ec4e44a566f3a6e8f6d665f9d46f97e1c40d8133a7edce342d978c96f6d5a973ec6cb0fe8f0711447e750a48c6a1 SHA512 8965e3c818d1841ba182c80da7a05f16acd87a0c62f1895e3b04a44177c62091cc82b3ea64408dc40db2d36bd9da8513ed573bb9afdc843245da155f2fd12a1a
 MISC metadata.xml 346 BLAKE2B 630a1e9e6398ff312f8536ec7e6d92b2a3bd8022c1ddca424474b43266440352ef63ea6d114c3eb21428e82ea5179810cbcf12b3c29b6f2603d038ec40ffb86e SHA512 a1d92ed8bb1d5619f8005859d7ed204016faf918885b98b56963ab9cc1e0607fa451227d25a5dc9efc88bc0de26039ca5ec4e0d3931c8fc32edbfe553912c23b
diff --git a/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild b/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
index 7d6bb186b895..e3a4ee31a774 100644
--- a/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
+++ b/dev-ruby/rspec-retry/rspec-retry-0.6.2.ebuild
@@ -15,7 +15,7 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 ruby_add_rdepend ">=dev-ruby/rspec-core-3.3:3"
 
diff --git a/dev-ruby/rspectacular/Manifest b/dev-ruby/rspectacular/Manifest
index 9f6c1f8454ba..1ce43972afb9 100644
--- a/dev-ruby/rspectacular/Manifest
+++ b/dev-ruby/rspectacular/Manifest
@@ -1,4 +1,4 @@
 DIST rspectacular-0.70.8.gem 16896 BLAKE2B daf9b75be33ccf1b7d60a7aaa540b391578b7f841bb1999c52e566caf8000049d7b2180f372084be18bf4cf367f6c59dba422f187505e42ee6bd66e9431ed11c SHA512 6f048a7781bd672049c10687eede3e2218436ea396438e09814c9239cb07396df25f4b88ab78b98f91c66457c4aceaaf1a1b8aadbff748715a881cadff8dd2e1
-EBUILD rspectacular-0.70.8-r1.ebuild 621 BLAKE2B 82b31a0dfa385f5567c94e74c15df8f072c30ce211f1efaa59881830329ce35844153a507ed4dd407a62e6c1842c4c4ad2f508476dc848a4a778f96484530297 SHA512 95f6892f4a87d3c2853d907d4297bb1ba8b9b1c978c8bdc4ebe76384421960c04db104883046ce927c45417131845c7929d230725c36c4cd398e12ab6d6ea4ba
+EBUILD rspectacular-0.70.8-r1.ebuild 620 BLAKE2B 8a33142a9ff94d9a7d8f47464bb6a066a5aef18795d4f9a4829b538e30e9a55ddc7556fcb3d9a9b29f3894cca3ec31acc39e1515d2ab53068ddb029740ec4c1a SHA512 a09b250c65f8afd3482dcdb0979fa244d21a85e772b8dea33832ddb31bf6f747b80adf41da1a6d078b2001939bcc813ab424d8561dc97ce2963546b07cd231b5
 EBUILD rspectacular-0.70.8.ebuild 626 BLAKE2B 7b0f63dae46fe047f61f4ac07b767eb4ca8c09b340bb9c94d5ebad23ddd198ada5367e89a587df1303abfefb3c506c17a76e0198264699324ead3b00e8f1fda5 SHA512 52a6271893be934673418e6e1b64bfe742b7addf08ad3ad15f3a6fc6ba895d2eea3eafa4acdd1a1c7f5c40de4e7cbfe76ec82f60f4b5beecbc3127355edcf17b
 MISC metadata.xml 350 BLAKE2B 478dd5a6b615f4a0ca0217d2fd4daca21b8421cc34c61d4c4356788ed059edf68a0c9b747076060415d7e9a62e17008560f44da4d0909d3f68c50ea77f5629ab SHA512 78e3ba17336c86b92811af99283d12b0bc191a2f06d907d0c792aedc17d5a39d81d00acb4b884f074103cbca587c3961dace871fc82e4a9a3fc6a9190c48b75d
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
index 114066386d6e..b40e6bc54350 100644
--- a/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
+++ b/dev-ruby/rspectacular/rspectacular-0.70.8-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/thekompanee/rspectacular"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/rspec-3.1:3 dev-ruby/fuubar:2 dev-ruby/shoulda-matchers:3"
diff --git a/dev-ruby/ruby-net-ldap/Manifest b/dev-ruby/ruby-net-ldap/Manifest
index f1e454d00168..3c9435ce5d39 100644
--- a/dev-ruby/ruby-net-ldap/Manifest
+++ b/dev-ruby/ruby-net-ldap/Manifest
@@ -1,3 +1,3 @@
 DIST net-ldap-0.16.2.gem 94208 BLAKE2B aebfc53b29c3bf81eecfc50a7422bd30b7dfe1894f8b7ceaeb82e346ae0e3ecbf463f3f15aab2200d42a391782a07cea8bbbf3f1c0d1cd0ae95959ef77bc8a14 SHA512 5d0e63473b5e1b1133463a49ed1c88fbf00fda06265a9a091fdb513f1d20fb45e5227c6384a9adc82ad71082ef07786cf63143060711b15386ceb7d3bd7b800b
-EBUILD ruby-net-ldap-0.16.2.ebuild 622 BLAKE2B dcee813f8528a26fad8796de19cb0ddaa0c6764abea4be205951b0ae83e83e539f521fd3078df1e9830cab1447a595727fa856116ea3ae9a07c22e7ff2c83231 SHA512 223e315bb0f5b5ce64feb059b353b9c1780da44f2a5b4cb48bce3760bca2ed595df99f1da579399abc85d2a9bef4044c8baab8840892f6aef0b397841ffc8e1c
+EBUILD ruby-net-ldap-0.16.2.ebuild 629 BLAKE2B 153ce9b90e84bd6177e46d1438b78cb61711bf3f2344922fcecb3f8d0d6c8fdb483d007c81de8b6419360a0d694b38bd487856fde0afe9d5428671c599ef8a00 SHA512 2cd38c26412f0d2f4949496a75099611b9914959febfa0917b19bdd8ced5feeb7022d8c558e3ba173d38bb3990c71432bfe4b1a5e981d019aecea5e2a97bed9c
 MISC metadata.xml 349 BLAKE2B 8048fb25bfc3ecc99fce9301034623a0bb6f946afc23ae87d2308f4cb5e65be2774894573ace6d5808090118105f81a2565cec6a00237a41ccb071170454b7e5 SHA512 522f6bae26a2b7d3ad4876b5fde3e710e07ae82147275a031c3f622df1775311560603960cf6909ba755039f2f62cc2971a3b29871ef7d1320e24d375070bcb3
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.2.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.2.ebuild
index 47713d56aead..264834ae7694 100644
--- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.2.ebuild
+++ b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.16.2.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=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST="test spec"
 RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
diff --git a/dev-ruby/ruby-progressbar/Manifest b/dev-ruby/ruby-progressbar/Manifest
index 6f5f2b7e816c..514da98f28f9 100644
--- a/dev-ruby/ruby-progressbar/Manifest
+++ b/dev-ruby/ruby-progressbar/Manifest
@@ -2,7 +2,7 @@ DIST ruby-progressbar-1.10.0.tar.gz 51483 BLAKE2B 24b92718fe933caa29460939a816b1
 DIST ruby-progressbar-1.10.1.tar.gz 53416 BLAKE2B ee435291cd55558843ab05254c01a6148711aee54a5ce80d7b03902e32fd8735fda2e3686794f3f2c8a62c7ca26d90df4d63b48c8d947a471279c35131c49898 SHA512 6cbd791833a1638949c7283b5c475164b44ec8a5d4c7eb417d741da5c9cda9e777481a785f112be7fd1c3714668ad58cbf9aa39eecb61d1022fb3bb35ddb6203
 DIST ruby-progressbar-1.4.2.gem 24064 BLAKE2B 4c26f5c281129a7333c8a7a1f7738a094ec02d769293252c8fbc6df0bea99971cd0d235b6bbeba7e2e4fac10409028f7cdb15870484878c26d9ea9f709f0135b SHA512 443fc015b2dcabc76c685f1529a39ffba289cb00c3cee3992ef240fb9822729f9049db4d85c58ee1ab6cc17927cb325044ea45a968c755a9b5ad93f7b9999fbd
 EBUILD ruby-progressbar-1.10.0.ebuild 1036 BLAKE2B cc1a671361c75ec7c53d71be60216423c00ebb065ec8cd7761508bb3b3ff289afa0a7a4328a9e1bc2c0c4a9ed7ef8d2ffa934640bc0835394b6b1b2ff43f2ba8 SHA512 1fc42617574876ffa95a44c353b29e54425f3cb7c5d85e5edaf54d96b1be87434b72006164768b05b85071893f4ada4028c98691aed89be2c9f0cd1c87b4df5e
-EBUILD ruby-progressbar-1.10.1-r1.ebuild 1024 BLAKE2B e37ce54d45bb14bfe1cdf34a57f69a7304c07819be59ca6e2245f65c9824287faab79006d6f7f00f096eddab8beca73f0f03b4bb16c8b084abfc47c8becfed74 SHA512 3b05f3f0c4c6b5a0cafbbca8a5dded71c7d20bb7d550843db8082d3b49c8571681e23cdfde3f904befa9bddfe8a7c36bfbef9a5a5280952edf1c1392a8624f7b
+EBUILD ruby-progressbar-1.10.1-r1.ebuild 1023 BLAKE2B 440afe6ed2a1fcc164215739c179a261bec628b2e6ad3a402b5c653a91d0b136ef62227616b3716fb0dac98de838d6fe7d4b9e647b1b8686bdb625b176499b3e SHA512 35ff25452182e283e6fe757700ed1e8bfa4c4b27064e9d9635dd9cc40f25178671c2d932bfdf959091440d26c264aad46da64b12d4946c389327e8e0d819fb22
 EBUILD ruby-progressbar-1.10.1.ebuild 1029 BLAKE2B 24093411f6bdcf8e8cd93761d889682edcd462d898b558b656a4536f0420f3c89f14c67ce118f64511cd930fe378cca809a872a785274794eada2a07afe1cdb6 SHA512 82a8e0d8e9b0641a832d4b2a1f77d73e88178580729fc897b5c6cb69b140eacee5c862980575cf97cb1e8f647902e9870d0bb06ada04f7a84d1d077656cc1a74
 EBUILD ruby-progressbar-1.4.2-r1.ebuild 576 BLAKE2B 7cc41633d4f3b805664e88f72d500ceff5eaf84cfbff867f769d55de20094b17ad47810b873bcd6d9aaf382f7184d6e9be8360cee7d436e69df7e8c3086522ff SHA512 39d0005b34e1b9cc827886276bd1bc57a0162ce189f3e2ec050906f8df4ba67f2e928139f66a225955ab98a5e036016804fe26baba939767fe32102735bda142
 MISC metadata.xml 352 BLAKE2B a36b436c51b56ed96a170c6edaff16655ff0d3b42f2cc6b13e67c252f89e2d56c47ce0c69fd693acc9ddab9a755a5fbf5d72e360f2e6a16bc0117148eb7a25ef SHA512 a572b7825c4e778c503bfa3bb1b82d4d91c28285578c614a8a0c62bdf1967f307645c92f0101a4898baa0ebeac9a26455e459b2440db6989593c0cc4472df616
diff --git a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
index b6ec3ad17681..9a3af0575d9d 100644
--- a/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
+++ b/dev-ruby/ruby-progressbar/ruby-progressbar-1.10.1-r1.ebuild
@@ -21,7 +21,7 @@ RUBY_S="ruby-progressbar-releases-v${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="test"
 
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index 0ff7926ffb69..f33560462e24 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -1,14 +1,7 @@
-DIST shoulda-matchers-2.8.0.gem 153600 BLAKE2B 49ddfe686bbd80665cde74019a046564b6863bca1ae81517ef1ee8c9f91e3f5d58a5d25e7640b1a5e3cb9c99367f9bf5672f63b9632427eba91c40aa4d2bd2ef SHA512 7b40220811a11cf57cfa38457eaab612ec9f6db5b660df21bd142b3df30d3691d3b7b3b4f931eed1e186c5afe4b576eee2c86f6f8f491d46955598f1441a9027
 DIST shoulda-matchers-3.1.3.gem 208384 BLAKE2B 0ce7cb91ec8a311ecd4872ca45b178686fedb126fd5a05d55cc8654f5a40d1ed7e0a1da2b2c47c34ce3e5ed13a302a1d309f4afa67bafb37d5ed8a724945e97f SHA512 c61397d20724f3048172a8a20ef8abaeafdba3a1d5d4b923b1b11480b25c70820fd372eb2851c6eb307894bc0b7e1aae515e23a3581a83db1b65a2c778b22d67
-DIST shoulda-matchers-4.0.1.tar.gz 222637 BLAKE2B 70d1aaa08f7670716f9ad385a22cbca709827f2de276d2a82ea8306ea43c44e99f9a2e698813a8c99036568a1f451a7c39d06dc5effd438d2bd31dcab32df8a8 SHA512 c2d8b80d4a0fa8d607b62f56c2718fc9922459f85ffb8a56b0c933c60fc258ce3fe75b7676fee1b178c56d1e35e28356abd855e2e7046b82268f743010c9b273
-DIST shoulda-matchers-4.1.2.tar.gz 234999 BLAKE2B eccfc9850a7e1ee7bd85575b014c372c0e48104e7792df60046006cfc8398225edd3229532632da30f40bd5b2274aa5a5ad4862edf4eb43832d010efc5ecf773 SHA512 c0b78e2cceeb3b7af9b38b248807b2f86cec85f0ad778a1b9b4e355f6d5488ef125623d9bb2fe10983dc6b6c0cae343b2497a6e438bc3f9c148ccd5462c70510
-DIST shoulda-matchers-4.2.0.tar.gz 234267 BLAKE2B fbd0a742850dbd2eae397c5209e649183dab054af59f10eeb6c6c334ef1bc9ba7116c1758980bae4e988eb3dd496cf1ca7e6af41f3b34da64a77938b953d0935 SHA512 67db32b1b9152f73c9f89679a5415869bfd1cef336172aae05c206a3c1cf9acea74188c69457e5aefc9e2067d0c5a9ad7d9250bef6a3b6980e43f48ff9b981fb
 DIST shoulda-matchers-4.3.0.tar.gz 235212 BLAKE2B 03d634a851d5b79baac7fb3c5017be2ba8ce5b36905597eb759ea6ed22d543af5ce02c0c2af0f560d913d17713a8b3c417770adb7f247a6548d0666164e0866f SHA512 ffc90760ec47502d0820decfb8ab0620fa65fd9f45f3435c1d905ce0fe96010a3e059c690e9dbab7b30146b09a9e511ed4687a220d7cdf000f2fe1060e0b5ada
-EBUILD shoulda-matchers-2.8.0-r1.ebuild 522 BLAKE2B ef2bbd2854cf8cd5891865b7eb97ed867fe804106b1f6c54dcebb83aae58f3b79803502fdcd042e36c007e36ce9c6d73f9dd3195c802305c42cb02303addd656 SHA512 1e39bd6760a5c9984e64a410d531c387b1990f8014d0bff5c77ac97f442d969f30eb7bedcaa7a4af128003f8fe6ec37c7bb17466e1c4c3f27e4b307cf6225409
+EBUILD shoulda-matchers-3.1.3-r1.ebuild 516 BLAKE2B 157b0a409389d2984c0c7e1b4e2a6589fcc5dd8a6a964b229e8fd6295e3f06f1271ce742d64db4017afc454eeba73c4e143637c21fb6fb82788bb0942f2b9117 SHA512 6c1fb3d4fd0e3ed43dbc61d8122cc1b7bb94d2afe3207dbd72780460eee3a10c64671d0cc8d4b24417c515b612777a222ec3adb301c9730224b08d55b39356b8
 EBUILD shoulda-matchers-3.1.3.ebuild 529 BLAKE2B 8e86c34cb17d6cee8e2a6f139eb4337671ce57f38c0132568874c7f79d0784f4609d30684df3e4a0bed5eba750684f6de31f86be44f9369769c9a9d515cf01ed SHA512 2bac2b7f6d1bbc17aa01a98bb244212af4b90905b7a1516ae5f0e4a3a6b33f67cceb17de2064675e4711565ed6b24e1f7fca5679402723d8f795c72000c58a33
-EBUILD shoulda-matchers-4.0.1.ebuild 766 BLAKE2B 42cab2f7fc8c69fa5ce203c807336f5dcff28ec50754410c11da22d3380d82caba8501c2f9bf6d0aec7e0e4c88fb61a58f8f366d890199ddadcefadecf83036d SHA512 1838812642bfe7541fb2148a132f2122328add69216b1a3743edc8c589ef98039fab042fb1a67379a736b13f43b649a20fb6d21f15bada83095ba8af6285899a
-EBUILD shoulda-matchers-4.1.2.ebuild 804 BLAKE2B a40496fb76764bad6290216008cec8c1e0180a1a9a13fcb9ce6d86250d9397d53966aaf8fb40c7b0eabda02019e0f53dced7c91d956618a8f6d9354078061c82 SHA512 18f0c2ab247c68ce27ce8842b002f795b7805225a12d2e75059440d91b1dc4c20526d9af275fde16c8b7d6cf99d2313ebc21493fd06e20b279b86993e308f0a8
-EBUILD shoulda-matchers-4.2.0.ebuild 804 BLAKE2B 89f65ffb4c3f60378c878a0f88548f5f1ad56a4a8938e2a586c87b71d5c50d59d66cb6f10a3de122d3a92f267fa535784a1b0313570bdba323ed43c547a9d786 SHA512 210a31514cdf9af1d2e8566c6111221d7541a46e289dd570e9443aaabde340b1dd266a69c57ae3ba7af5af24f9b4c9dbac79419a5134eeece4f6d3cc749353ac
-EBUILD shoulda-matchers-4.3.0-r1.ebuild 799 BLAKE2B 7ed726a1e69654c9c320481aa6ee18db65f02307a38a1bc0541c93ac36e37c3542294518d5b53316bc21cc5789d8a084ee9952d064c24d19a233050bb5363955 SHA512 cb77fb9b2a0dfc9d68ab6fe0966372112238c556334c07877802d9ba0499ce155570e1e3ab39ae6f1dd7ea5e8377bf124361d5cd33b3fddca818d70e191fdef6
-EBUILD shoulda-matchers-4.3.0.ebuild 804 BLAKE2B 89f65ffb4c3f60378c878a0f88548f5f1ad56a4a8938e2a586c87b71d5c50d59d66cb6f10a3de122d3a92f267fa535784a1b0313570bdba323ed43c547a9d786 SHA512 210a31514cdf9af1d2e8566c6111221d7541a46e289dd570e9443aaabde340b1dd266a69c57ae3ba7af5af24f9b4c9dbac79419a5134eeece4f6d3cc749353ac
+EBUILD shoulda-matchers-4.3.0-r1.ebuild 809 BLAKE2B 467320e699ba0814942f3d07fe3042b08666b8b11b0d05c7e05f2fb2bdf8152428960447c31b5b4e095a2a33a5b60cac29faad4fe6a7d3fa3f0cf6e667adfd7d SHA512 c0ca051a12cda0043f23adfbf3132cb5fc23a3d03bf0279770d2cd80e9e9f31203c145e4eebd5cd6eecbb574069a2e3af247a6acc5395c462dd06d71d254c830
+EBUILD shoulda-matchers-4.3.0.ebuild 815 BLAKE2B b0659e19572024e2db6db9a4620756f856c110526c5d1e2d8a398322b71fb38cd43453ab40214279ba5cd0d55007b73e8fe195656911515c17ea1fde2e1768d1 SHA512 3eede673c7b40c5f0a245e8c3d5d45bff86c050e430d4df0ae36c0aac252f49fd69939542406d4d6a1212832e58da315fc270a8f0369858e740aeb22946105d1
 MISC metadata.xml 467 BLAKE2B b4a8138623dc83ab8a5fa10d6242f3d04d20ce4e15b0abb00f678600212063ce8653f3644c3a98d0186d4bdf53d042ba7f7bc1d1bdb699501d8a7e1aa7fb36b7 SHA512 d3ba695c8bfd835a472f35442b16057a73219d9b320276823843b65f00f18d8cfd7fe7f814abf458bdaa945751883a5f490d0f7a02a1c200d99fcfb51a57a400
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-2.8.0-r1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
index fa5a62a6a4ab..bd845ff47f88 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-2.8.0-r1.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -17,8 +17,8 @@ DESCRIPTION="Making tests easy on the fingers and eyes"
 HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
 
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ppc ~ppc64 ~x86"
+SLOT="3"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0.0"
+ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*"
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.0.1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.0.1.ebuild
deleted file mode 100644
index 58b1014729ed..000000000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.0.1.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="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.1.2.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.1.2.ebuild
deleted file mode 100644
index eac1dba89b96..000000000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.1.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/s.files/,/^  end/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.2.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.2.0.ebuild
deleted file mode 100644
index 3d466716405f..000000000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/s.files/,/^  end/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0-r1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0-r1.ebuild
index 5c7460d9df67..96c055803c21 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0-r1.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0-r1.ebuild
@@ -20,8 +20,8 @@ HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
 SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+SLOT="$(ver_cut 1)"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0.ebuild
index 3d466716405f..60349fce2fb2 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
 SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="3"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index c40e4a6b808f..981a6ec2ae0b 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -5,6 +5,6 @@ DIST sinatra-2.0.8.1.tar.gz 507102 BLAKE2B 7b88f50b2b2960c17aaa4f0ffbffaf70ece16
 EBUILD sinatra-1.4.8.ebuild 1326 BLAKE2B 4ad5b768c4cb9b61ce4f04bfb315ae65991d126e6a4ba42da2ed30c2cc77876cf0fc98c3e89f01550fe3ac60c36570c1a52af90ec44ae2acbcf71d90fb627f18 SHA512 7b91176276d8b5db61475df18ea2ede3b0fa197d2c7341e15ad8c71adf1f1d21c36161ab4523f8918f0ee6a71f5628a3e3b8021a1a4761db91fa0de39193f417
 EBUILD sinatra-2.0.5.ebuild 893 BLAKE2B 33f0039e31480122b8ad333e76f2fbd099dc37697e45f76551c9ee5b9ddde34d34df09d7da27051b3b3d44b6aa452b4a619dea352eb3333a8f5b1d7793f71bea SHA512 85682a0a1b7379ee4726aafed71dad02a97914fcc31f0b8304fbf062c0e156916bd9e048a6bf8cb1e4654f5dd0bfbc16b0005875543c5d04ad5a9ab90ab391ec
 EBUILD sinatra-2.0.7.ebuild 859 BLAKE2B 417e6ad516ea9dafa5de69ae1b85346f2105699c5e937e9d6dd70e80c14fd59448e28099f51951f6f62034a3c43f35f4a3b10b14446a79aeda7e66257d4ad4a5 SHA512 a7ac8c4ebc7f423a8fa4966597ad23311dd6f908c2dad389cf635993d4e7a1377167d42519ca75e440c2e94e1ce64d23bb9ad239ec2bc0692e743d89e741e0e9
-EBUILD sinatra-2.0.8.1-r1.ebuild 854 BLAKE2B 932e864be460e6642d6e4304f84ed4723ee9cbbfdfc633dc2d09fa0e47b314a8478939bfb0cd082f117c90c643919d541f7f35e093d1fb307159ed201e5f5029 SHA512 9746d680d51da36f9c3558760824367c5b76f21fce6b3fa1716d140f2655760c66c10a0ca1670d63ed082cb551f81200ce90582573b6d8f61acd59d7c5f765ac
+EBUILD sinatra-2.0.8.1-r1.ebuild 966 BLAKE2B 36934453fbc1e1d861a80ceced9d1563f3edbc58195a6a9ba4fd0d6d43e9a8c3171160973f0007d92067ae99ab7313a126d036a237b69d958712b0b3c5feb08e SHA512 b7a8beaa1c6d4e6b3b6f5933b79535ee51a0e92208cbcf89d64e7ae074e5d79e86d9d787c5364cf6bab71ef7746b489559cc44e40c6280848f163ab07f08357d
 EBUILD sinatra-2.0.8.1.ebuild 859 BLAKE2B 5d93b3d9572ba4874322b52f35324de551436de0185051b44b7afc161983ac681aa2f5c6b4d3c57c077b93fb37bfb16b732c7c8e6e405b892524786d7530f817 SHA512 340e52ab29f857541ff5f48e1fd66c6cacf40c8d2bc831f9385d6c5df0b149e256bb2ca012cd28b958ee197c8b7c25ab1d1b042e515fa3c6c1dae21644630947
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild b/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild
index b365cde14ffd..ec9fe93dc5ab 100644
--- a/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild
@@ -18,13 +18,17 @@ SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
 	dev-ruby/mustermann:1
-	dev-ruby/rack:2.0
+	|| ( dev-ruby/rack:2.1 dev-ruby/rack:2.0 )
 	~dev-ruby/rack-protection-${PV}
 	dev-ruby/tilt:2"
 ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder dev-ruby/activesupport )"
 ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "rack", "<2.2"' test/helper.rb || die
+}
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index adadd9ed71f3..1a902441a8ad 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,7 +1,9 @@
 DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
 DIST slim-4.0.1.gem 103424 BLAKE2B cf3629e6bb5254082ee3596dc4ddd05921186071823cfe6c423d3f173f80c46ca874e3cfa9a795ce4d564da2c7aa42a422513677978a6e79545a918ef3b9fb6f SHA512 afdaf01ce8372e270c00bc3fd863b9c2f7d26c851ed032374e648f069e6591e9522d4490f57350d4f13b85c68e6a9038111ad03a644a8e89894dca4ebffa0c90
+DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
 EBUILD slim-3.0.9-r1.ebuild 1628 BLAKE2B 1fc3c75042d2c270ba06e37c9e41a2f9454b82614289547133985156aaaaabd798ede3c60a635c02bced648ad8a020595e0870fff63225ac85935f6a70a593d2 SHA512 159783c00c5b0f916083850e36f645907adfd97007e284c81fc333dbbd09a06b8f0c11fb95041ba62cce99b65e90e551ad1706555e03778a48eb0361f642375c
 EBUILD slim-3.0.9.ebuild 1605 BLAKE2B 496a811173678e88f1dfa9fcce6d86805792fe5e15b7358dc8516894b1a59b0f714fc9ca554be64cef28f5a6d958a2ed4ead154fc15535985a6950dae46cff6f SHA512 2cfb0c25bf080f6978c52d715a5b8daab71cf95bced321d3f12f2c0c9cc6501ae28de0dfafd092795987ddca0b24d06b6994a95ff0f48a226cddb25ef0f7ff45
 EBUILD slim-4.0.1-r1.ebuild 1652 BLAKE2B a496dc282db3865f1adfe7a7d9cb532bd6b3dc632cdd4757dc893700ba9bc2276e0fd2d04e2cc406477f426b078ccebae61107c08050dfb95278fa69ab491ff2 SHA512 131eba4093dc1e5cd30335aea8268aaca079f05a6dbed5b5cfe6a631418b9747d8ae698b638013065a22f23642dcda8aafdf3902500aab7a47cf0b3c2cd9ed8b
 EBUILD slim-4.0.1.ebuild 1632 BLAKE2B e1ef9674ee4f97da581e0c037f07588c48b10f09e6a79af8be90dd723439c8369cd4c89ba1bfeedde9f3957e01e833d843c659e23ae694a1312933ebaeeb7a3f SHA512 01a63fd274c61a6a54bbdd9489df261269bd2a0fd4c09faff970760db181cdb3b17cafb485f9c7db681ae9a1acb2f7a243f5f8cc15f299937a6b6b00699e90fd
+EBUILD slim-4.1.0.ebuild 1673 BLAKE2B 5b291bb1307e0c31a20d265ce1d39bebfc21843ea8657f0d8a0a403f9bdb7d2a1613763d50bd8ad29cfa4907a49bf7f6693ca63975e418982d7c9518a02d51e7 SHA512 b788c866838292ed0092c331d5232011213c40f9c4bcb830e032323f60a9655550e97561a00767b6892b91a994982d75cb8046a882f054213891e53e8441d9a2
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/slim/slim-4.1.0.ebuild b/dev-ruby/slim/slim-4.1.0.ebuild
new file mode 100644
index 000000000000..7f7a6d8b4595
--- /dev/null
+++ b/dev-ruby/slim/slim-4.1.0.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="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rake"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
+HOMEPAGE="http://slim-lang.com/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="doc"
+
+ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
+	>=dev-ruby/temple-0.7.6:0.7
+	!!<dev-ruby/slim-3.0.9-r1"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
+
+ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sass )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# This sinatra code expects tests to be installed but we strip those.
+	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
+
+	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
+	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
+		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
+		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
+		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
+		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
+
+	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
+		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
+}
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index a4ea54822df3..d7aae4e958e3 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,5 +1,5 @@
 DIST sshkit-1.20.0.gem 155648 BLAKE2B fdb95aed6d407c598abde71591cbe2d7b1f98d91985695509a6545bcabc5c0f3337cfe8f73e82f4b212e3c04b6da09e7521637934baeea7a9b5e268ff72fcad1 SHA512 682234f99d6ae9533c99f0319ad0f3732f2ff166a8f1a07d5ce8ff59fd9606af9440798a39f657dd3899e9278639aa93d5fb29af8f64b2ebea7f3b8e75fb25fa
 DIST sshkit-1.21.0.gem 144384 BLAKE2B f4f77d9cf00db4bc0ab6ac092dc859af31fd50976fc9425c0e5ba1b5c1607bd9b50fff44f65f0207b9d9d604c5ace153ba05ec062fb064c44673572769416a22 SHA512 981fdaa19d633e92d4e3ef5fc9255a89d992813c400af4a468e6cf12ca52cbe612b771a87afe6392c4098d07b42162d5981025b8b214aafa197a68222b5e234e
 EBUILD sshkit-1.20.0.ebuild 1160 BLAKE2B 0d991bef3cb64cdf8d9c3325212092ff7534d8469b80c886ad3988179b2813bbbacd5a446746ed9963587963a2f2a74aa18231e5636da857a4ed40b3b834a06f SHA512 d011cacdd85ab31275bc552fb874371c73aaf9771b11bbf2cbae47099563ebe5bffd1999898cf5aa900db413967bbddd39c961deb92264711ddbb0f94ef2e75f
-EBUILD sshkit-1.21.0.ebuild 1161 BLAKE2B cbc954091a2839e4cb35f013139b68fd886c7b8659af777be13c545d09d8467363b93d011ae70728ebeafc0f28a86b662cfe3520b5cf6bbc381e2a4ded038f6e SHA512 28c6ff1acab4a332fda56ca91c67be14dbd410039b4582ea5804d3ada0b16f93de2f1f3092cf241a2dfd568f11e4f08cfe5a4137175ea137ecee162bad3566df
+EBUILD sshkit-1.21.0.ebuild 1168 BLAKE2B 265d5a619fa7318613e7043abf743b9b6337cf5d1a31024da8e39bb2a50ad84bcc15a224e9e761332cc67a8f6abe07732d4603c440cba5816eeaa3b04a5f5d21 SHA512 945921e29bb6af6ec38b4be001f39b89ba1d93fbfd5368bbc90dbcdf448485e8f9c00f3cd0fd0dc05dac8bd5f9abd54aa4714796340f9f0fbfac441543a250b7
 MISC metadata.xml 343 BLAKE2B 0f8326d45916642aa200df9ede8640367ffbf73022b847f54f8869884a592489bc26a0da45406cd5409973e43290dafa3cb785460e7da61c20de3a796e025a03 SHA512 852971e242c5500cf6ce4fb0c2bc58560b96fdb8cc0f366fa41cac8e066f408330962cb86a35171c08bdea3493be81fbb10bb501ce207f7016a2a1b7c42d263b
diff --git a/dev-ruby/sshkit/sshkit-1.21.0.ebuild b/dev-ruby/sshkit/sshkit-1.21.0.ebuild
index 8b726b006ab6..0c7d9e01c9e0 100644
--- a/dev-ruby/sshkit/sshkit-1.21.0.ebuild
+++ b/dev-ruby/sshkit/sshkit-1.21.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"
 
 # There are functional tests that require vagrant boxes to be set up.
 RUBY_FAKEGEM_TASK_TEST="test:units"
diff --git a/dev-ruby/stomp/Manifest b/dev-ruby/stomp/Manifest
index 1c77e7401e21..e58a5dc88c1e 100644
--- a/dev-ruby/stomp/Manifest
+++ b/dev-ruby/stomp/Manifest
@@ -1,7 +1,5 @@
 DIST stomp-1.4.4.gem 93696 BLAKE2B c1647ba119946ed41d58b1fe08baae5fa54317e3ba4b4b33eef50b7ff588daaf2ecf89a45b21b3eac7969609337fc8b09d73ea7f54f40af6c4b2613cab686df7 SHA512 77c5a53b56177869beb9ff236405479d1fe48ba6841f42eefbd104a5e1b8f82584283c909bb2f6ec5a34ae99c0dfa91079d0716d1bef65db24c5b1414c1ed673
-DIST stomp-1.4.8.gem 97792 BLAKE2B d3a3ff9795adfe9b53a60a3fa9f18e9e96693882325475fba6629b2c4bb4cf3fc3d9bbd68277d6dc3e093ceaefb680a5f0365e89cd87fae187880c8b35ee022e SHA512 6e5c0727d4b3853f90f8ec4450162b38f571dcd63b58a4d09c284f42f5b9ee884ee8a3b8d27c8d85f8a297337e0d6ed61538bafee840cfc26e15b15039e1e4c9
 DIST stomp-1.4.9.gem 99328 BLAKE2B 9aa50880224cede15be69657ec7ecccf1a075db3e51de55faf3a0ba50335b90b910d1202c646585229cc35c0e2e4cf01fd99774960d9ae90ff82030c4bac6a69 SHA512 e1e3aed86621e2dac199fd7e4ba67fedc3582b5cfe9e4ff2efbdc9c545bb25d2c52391d9403e2fa935f69635e85bd3c1ca29d2d5b3c425aa850d3ccb8f7a5e86
 EBUILD stomp-1.4.4.ebuild 446 BLAKE2B f0988cec062813e456a334ee0e0397fe578f7d46be7c8cb00dedade018bf8b6dc498d346a0b3ed6d187253d9fb09f4553a049ff6148a1b94cc5aa7ee1d7347f1 SHA512 182fe4d9b410a4c27a4fc14269ef257c915c43b949cd65c1090c3f0bc129967fd3079ced1affa2b85fbe746e08c0228be5184a5a5238f8d5d5167e71dfc43f9d
-EBUILD stomp-1.4.8.ebuild 622 BLAKE2B 5866baf72d790fcfcb8fe391a66f4301c647e2c93fc64c383dc371d4b2d7e65f36f502a07bfc0cafac24da45d6c442ced7ff761ff08ca5e54cfd2147fdc3e7ab SHA512 908e9091ef526bc08901135c87027dadfefe864ad13c1045fd3fe8c27feddf8c69ab512715425a43dfffe174ecd9d68acc7308f8176230ed05227aa2f00e73cd
 EBUILD stomp-1.4.9.ebuild 622 BLAKE2B 2c0820c3e6ef1b155e87ddc0508bc03623585e581c2cc905210bda92c97b91965e4f84aa9501536cdf02f7c14fbb6c8475ba671cd3cf8c11147cc981966cb6d1 SHA512 31c363ce72bd25ca975d20177b2884fe7256522a7902be34f3755139e7478579af71a3acf78e3b2407b19efcc11b30d1aa5887a310596a45c8c8595412dafdfd
 MISC metadata.xml 340 BLAKE2B a6651b0b90e84ece8ba5aca92bff77b66b97324fddd4b54aaf141ac0627bfb7ab5a9533c5610c3fbff944b354c938b12df8859cb5773f50b525072eef4a1d6eb SHA512 4abeb3f05f1cca14519cc2cb18d904bfb953ddf661b5ced2b5f790df590b863b41ab4b11ea9ca71bec60fa5bfcaddae84d216471c2b3cb2be6f01f2b965a592f
diff --git a/dev-ruby/stomp/stomp-1.4.8.ebuild b/dev-ruby/stomp/stomp-1.4.8.ebuild
deleted file mode 100644
index 6564bcdb89c1..000000000000
--- a/dev-ruby/stomp/stomp-1.4.8.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby bindings for the stomp messaging protocol"
-HOMEPAGE="https://github.com/stompgem/stomp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Skip specs that hang the test run indefinitely, most likely
-	# because of rspec-mocks deprecation output
-	rm -f spec/connection_spec.rb || die
-}
diff --git a/dev-ruby/strptime/Manifest b/dev-ruby/strptime/Manifest
index b48d72c45896..4028da8e16a7 100644
--- a/dev-ruby/strptime/Manifest
+++ b/dev-ruby/strptime/Manifest
@@ -1,3 +1,5 @@
 DIST strptime-0.2.3.tar.gz 17375 BLAKE2B 583566c19cdd96f97b469d3353236624b814ea9200e1479d32c552d06431e0008cd9dcf5be03564948898fb9e5a1470a5a8bdb531d4054bfe64899bbd6ec92e0 SHA512 1b9ee2f7c0fa747c6df5a56c5d7f667c4a9314c334472867e890758074f9da387aae54d9171b2460036a21e890fd743187571c6d4a995e4117d6c4307b8134cc
-EBUILD strptime-0.2.3.ebuild 869 BLAKE2B 1d82d08d5962c7dfab8ddb163ecd494e4c5dd61e8f3585c0bf0050b04fd9dc07af2d8e95a8ba55ceeed74c41b5c1e8a54b86dea36027433f0fe63acff9ee1a04 SHA512 e3954b95b15674f1c4369a9731bd6e2199a1ddbf8b65efecb7c3490ad46641be857cb780a01fb978e1ee100764e0f16f598903836055d0995ec60b435edfc010
+DIST strptime-0.2.4.tar.gz 17429 BLAKE2B 9b6a7f29075ef5e55a17f28859961013d96778c7bd78fac9138a455819ec062f4b0d311038026a9da45ecc96e3f92207462970201c5d3095b9b0d653706c64a2 SHA512 ae92df60e049eb57e60f414e0a436fd90b56c6a3f5812597619aaac2d78b80046aeef77cdaae6f8822f37d069903d2806b9f7710ff1520eaf11070aaf3465f56
+EBUILD strptime-0.2.3.ebuild 869 BLAKE2B 3130e7031dbf3803df2bf9adc30a12feb51b3e299e29694b6d68aba6807f866b55e9dc55e6c437ed4a7a58e5a6bece1c484d515bc607fba58b1435170ad08ee3 SHA512 369f4c7ffd85961ee01c697ae9ae4cb70675e9e27d73ae0c731942d81a73c9a4db0d13f74e120a95ad806567ce3fbfb3cb0dffddb6221c673c56d692f7d98bfb
+EBUILD strptime-0.2.4.ebuild 869 BLAKE2B 3130e7031dbf3803df2bf9adc30a12feb51b3e299e29694b6d68aba6807f866b55e9dc55e6c437ed4a7a58e5a6bece1c484d515bc607fba58b1435170ad08ee3 SHA512 369f4c7ffd85961ee01c697ae9ae4cb70675e9e27d73ae0c731942d81a73c9a4db0d13f74e120a95ad806567ce3fbfb3cb0dffddb6221c673c56d692f7d98bfb
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/strptime/strptime-0.2.3.ebuild b/dev-ruby/strptime/strptime-0.2.3.ebuild
index d729ffe83522..20a5d9d41adc 100644
--- a/dev-ruby/strptime/strptime-0.2.3.ebuild
+++ b/dev-ruby/strptime/strptime-0.2.3.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"
diff --git a/dev-ruby/strptime/strptime-0.2.4.ebuild b/dev-ruby/strptime/strptime-0.2.4.ebuild
new file mode 100644
index 000000000000..20a5d9d41adc
--- /dev/null
+++ b/dev-ruby/strptime/strptime-0.2.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="strptime.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A fast strptime/strftime engine which uses VM"
+HOMEPAGE="https://github.com/nurse/strptime"
+SRC_URI="https://github.com/nurse/strptime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/strptime extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/strptime V=1
+	cp ext/strptime/strptime$(get_modname) lib/strptime/ || die
+}
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index fbed30b217e1..3c92879761d9 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1,5 +1,5 @@
 DIST temple-0.8.0.gem 39424 BLAKE2B 48df1f38a2df12871b13a8592afecf93fdd7c13497491d86c52eb2e06d47768403a1c8e7ca6201d73f319a9f27d65ae08f15c6c177b1b6e5d73b37483f01a4ca SHA512 ad57c484de78f029797fbf4331fa9c24247d6cec2e3dea447d394a104eb9496c91af45f505b720da1c4242845d94b34b626ca586c625cd126f72d1e4296ab2a6
 DIST temple-0.8.2.gem 39424 BLAKE2B a56db910d1d4d52495806e907c74052c04e6b4843d040adc33a7f6dc28a25a02231c4c9bd41723c8e1abe6624d4d55375c2a429514a87fa4f7a7a8dcb6377796 SHA512 51923b3bf9d4c05255131be62f567ca21305ba023ea5395a08d6970236b2a2833b058f7b3906046b8a57a224b368de12a6d5e426effca39324670fb632f33b67
 EBUILD temple-0.8.0.ebuild 654 BLAKE2B b7ce0b036d9068d1b79582cd6c53b56eb5ae5e5efee95546a8d2dfae3755b0f222854045108e1e23136f3db05c5843fdb96d18e9b96684d3c2e170fed5e5afc9 SHA512 85669b5b970a9c98f3ba48cd7e236ec161ef8151ddd7d5c908b35b39e32bb248d3b8e43d52f4f544780d7ec7d7af22b643b967e61817522cb84aad6566ffd892
-EBUILD temple-0.8.2.ebuild 631 BLAKE2B 4775bd45ed57ce05d017a468291c5deb97f6c84e43f673355ef685e9ffb2f8c2b630d069d5aa5c52122648b38192f803d3e568c8faf02780ba92c77fe3873166 SHA512 f72c5fa473494772dc500efddb5ea1269e4d09c1578e41d7cfe900fc1c4c8a3067a762ef86f068d7a4f1c35e59b486e09be94368b118e1407963c57488ec6731
+EBUILD temple-0.8.2.ebuild 638 BLAKE2B 3ebd8dc40f7343c1e676a52ce7ab901033197f6ae618a24a8dc399ddcbbf8b2ad30a79de696411f5aab18f3e606e88ec9865a0631b912dc0516f1ed62c666caf SHA512 05d36d70a10fed46ab07c748317a7dc19270bb0a23884285a4ff030c8920a629005cd5b8285dce4fca6a8846ad9f6d965caef8af0b0103a001b8eb2f6eba435b
 MISC metadata.xml 340 BLAKE2B a58482ba0cb0351241c6826bb2014b49b554b28625c9f202dff5dd2c877454bee5a2f11c90cf05ca735def15bc9c7b05edab1ab77fa4dd1f2bf0970c1cc49e1a SHA512 ce7b6d2b6cd7c1d004cea2ffba1a8f74fd53afa3886f9fe248e30a066822cbfb0cf0782f8de1404ac11f492e496bf0ce1b4537aae9804108fbccf4e7382e41fa
diff --git a/dev-ruby/temple/temple-0.8.2.ebuild b/dev-ruby/temple/temple-0.8.2.ebuild
index 67120bc22174..52854b730da6 100644
--- a/dev-ruby/temple/temple-0.8.2.ebuild
+++ b/dev-ruby/temple/temple-0.8.2.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=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
 
diff --git a/dev-ruby/thread_safe/Manifest b/dev-ruby/thread_safe/Manifest
index f43e9966cf84..c359494cdc98 100644
--- a/dev-ruby/thread_safe/Manifest
+++ b/dev-ruby/thread_safe/Manifest
@@ -1,3 +1,3 @@
 DIST thread_safe-0.3.6.gem 120832 BLAKE2B 0e3a1aec1d34119dc1f673acdc3d2e18b8c5f970bf79726e4729a806a52ce6ab265fd713972065011e8a04cf2776dda871d3d747eec77b0e94235de776d0cb2d SHA512 a11808576392c068e1cb31faad706be2b1bbfa4837c655c2ab1d5a235b62b25ece62065de6b65bd25496fa827ed89eb0796b90467107df255825e01316ff1805
-EBUILD thread_safe-0.3.6.ebuild 1075 BLAKE2B ebdfc865d5b102e27a47fac18ea7d8e81ae35fdcadc6ecc6fba25df7a7b24021457ddce09aaaf82956e0e0c943cd6b1ba6e1de7f2eb7ea37169c0f1dc6159ed1 SHA512 65810c1a5c4c63c397a6ba2c3668bc96e0a0157fbb0786df7a13fcf70eef913a002da73e5bee9802761dd86d072affd627b7178b5298e23d9ae739861247d0d4
+EBUILD thread_safe-0.3.6.ebuild 1082 BLAKE2B 22f4c4ff41bf46e74a0253163a6f7683911f1cc96571f5057cf8a42658bb2c07ab2680fae973a1af00d1a6bd61a71c17c64baa6356ca6ee33155ab21f49076bb SHA512 82042cfcf3d497832ee402d7e6649100dde1f67686ee118fe7cb4f347ca8d02a8350f40c357cbec11f9908a1c6a4b880582f1c401a69a9907aa50b786598d081
 MISC metadata.xml 354 BLAKE2B 00b77e62b42483c496a99390ca3e024b0d26e0a3f40275299401aa9f587e8bd3e5495522ab91a00c5a785f61759493ca0bcaf7f2a7ea71adb1c7790e669e7e4a SHA512 07164e076aa4dd3def9a69d2690b5044359562184040f63a2f09476771eddcd77d2723179c91173f877b99a23c9e24d2b6e959482ae83458c4d71cd099c1ab01
diff --git a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
index 945dd95a1697..884af1d7983b 100644
--- a/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
+++ b/dev-ruby/thread_safe/thread_safe-0.3.6.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/ruby-concurrency/thread_safe"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Higher atomic dependency since earlier versions crash on ruby20 while
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index e3c630788f13..ff76d312cc74 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,5 +1,5 @@
 DIST tilt-2.0.10.tar.gz 51446 BLAKE2B de5c12dcf22994f182ae163a82c3060f1d0d8b4bc2a4495f28c9befc954b4949b9d2ae6aed42e3a9c35fb68825844881d9f15b2b68d949236e5396083ff199a3 SHA512 4a36c55347e307ea0c842aad3da72cebe98bcf8a0421040cfce7a43540d1746e736ce92b7ce7492a5cfc184372842c3ac7a006f3650b4c9420d5825ec005b4ef
 DIST tilt-2.0.9.gem 55296 BLAKE2B dd181295d2317ef591e9b89a0a4cf29680a05403c89c33680f563459ebbfc675bfaef14c864f8c8834103fc2ea069b33dc928f2b804d911eec21b09427f7c619 SHA512 522b2b40ca1eefc7df66cb421c66734699a2ffb1e7d1797181c2718f7ca018d3376c1a2b3617b5d3549115af69108db4c3c4632e2682329d5baf24bfdae92b42
-EBUILD tilt-2.0.10.ebuild 1606 BLAKE2B 1235b8ce8d35f322e544700a36675ccdb01e434bace0e65bf0c72bb6b67ee7c75cdad9eb844f8a526a88fb360cb5253c8f5a114f52341e53c57a0361395a8585 SHA512 039f6236eb5d7e828bab7da31efe12e3367f14f3cb2e913ea7d1e807bae3a90ed7d3f9b3df4bd7c0a9cfb9a6a60c9f1e9a85cc9f24d9de002c55faa46aedb148
+EBUILD tilt-2.0.10.ebuild 1613 BLAKE2B ab55bdc9be0434a2d27d1d73b58e2f0ac0cc654d9a3d616362bc1c33b2aaf2ff7fbd7c589e937a08417ebb738008aaa84553a7e18ea67f63774cb948ad03580a SHA512 16b1b7cf32bce0510082705e2e6abfc9d080e55ca9d1b47ee2553f9085424e250ee13e07d08a59f17ccc2ec217af316d4474d0c4e701c9159f54057dfa9839c2
 EBUILD tilt-2.0.9.ebuild 1383 BLAKE2B 758cea59f103dea499f7fa6d66428c62a21ec4e22edf9e070f0079e05ad63e08202b345900f096636c55c63e9ad374f737d44c605fd961b3586168ea28d90e49 SHA512 dffc9cf00a14c4454f560e1e8e8ed6730fad6d31af1e82a8f2c626829fa4c9b4b9f8c7bdc887846f8ea759dae6dafc4e1c19d668f6aacab84517f67834ee4bcc
 MISC metadata.xml 339 BLAKE2B d8712c61994758c250248bbd14842a7b64d7808008e3d18fac9330bdc03dcbc6e721ffbb2cb813dea148036bcc40a60c4d8b1588b937a02712eb65c312ddb2db SHA512 f9ee61c88fa51f3fed6864d91c8f77bdcb492befce86f260a49faf141d6c11fc4563e57e1b35511571ec02a41cdb8f2111bb7ee76474d1bc65d81bbace15b730
diff --git a/dev-ruby/tilt/tilt-2.0.10.ebuild b/dev-ruby/tilt/tilt-2.0.10.ebuild
index 56fd1402cb8c..eebbc946617e 100644
--- a/dev-ruby/tilt/tilt-2.0.10.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rtomayko/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Block on some of the potential test dependencies. These dependencies
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index c7ab94448cf2..5766f01cf5e9 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1,5 +1,3 @@
-DIST timecop-0.8.1.gem 16384 BLAKE2B ca3aa8422841b83f4631afa102c4475f4df73c3968eb9ec17d2159a41ed976330ac9c078970f3ed2a504146ae0f4d88650892c314c92da6dab0f8a0ff0a24a35 SHA512 c4d281aa04fe94636dc23dc0fa6ea4a1dc27fc1debe550b06a208ceaab1d9d8b160f792bd5f14a7c004cecf489d4427df39873a68fe6ab27fe9c0e94770cc764
 DIST timecop-0.9.1.gem 16896 BLAKE2B f4dd9293743f0be4dc5616aae077965a32e348faa7019867d694689b0376c6be06817870842bdcbf5f398ec4814ae1e4f6546c75c95639bbd2cb8021a1dee3f7 SHA512 2c8429ad4d9c706865810caa80dfb12c16acaaa97ea289fc300e172a359817fea7d31789f4bea75cfae8ce1f84e7d8effd32b39a0482f3d68fb4e225b487e13e
-EBUILD timecop-0.8.1.ebuild 973 BLAKE2B 317082aa3b5e89620e7c4ea141e05ba40b4f140aa2178b49811d3532e7caff4504d9264f529ee94c270ca311b9777f16e10c87e2dab3983a65d9db5332672dee SHA512 872edfc55117ea77e41435cb7492cad6579d7fcc1f67f9bed6828ccb19de2997f9a7f3a8c43a164347f2dda147a5b041fbc283bb84148241fc098d119f347da3
-EBUILD timecop-0.9.1.ebuild 988 BLAKE2B 0a6d5becf1ed6ccbd09f9e08b2056f47f02af1bbc343c80fc14dbee34697b0ef6f041a2131e23282ad09d30844e67e024b61436c55d4f3525eebedab9269775d SHA512 de4cc5b52d89f0615e32093b28ea6243d682f8bef4d61c31e48dd1bb7e65e176a42a4897fbe229cfabe88c13dca970a5c72fb1ed6ab49057c7c8783952745b0f
+EBUILD timecop-0.9.1.ebuild 987 BLAKE2B 1ca3c6aae362cf818d7a28ab74650d0e224e9fa10c205abf3c643071699fdb3d955bccf3e76b6ad8943b5e953d768febc0bdd6b9dd506f14bb84e5498e0bd9cb SHA512 45c9de9cb0542bd552de17aae43af0a5dc04f1e4eea1b0a195778760547f4e3e40f5b47380286311dc96f4ce48c94de78c23942610c7a4a741c6995b8cb14958
 MISC metadata.xml 343 BLAKE2B 98bc9d7ecd9ac2badbcf92ce7b89b2b4e3798fc284b7dda56b582a0d18f2dfd4dee8b371bbd74e404985e6d370737e5ed746543393408ec60157b8d0b95a7b86 SHA512 1f1d30e9ec8a13854596017fc22a430ad0b34a8d8477804d28906eaa94c294f5cb7e845adff2aa89835681afab48f77b601b5cbff780d00bf0d58959b2ed4fac
diff --git a/dev-ruby/timecop/timecop-0.8.1.ebuild b/dev-ruby/timecop/timecop-0.8.1.ebuild
deleted file mode 100644
index b916263317e0..000000000000
--- a/dev-ruby/timecop/timecop-0.8.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
-HOMEPAGE="https://github.com/travisjeffery/timecop"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
-IUSE=""
-
-# Missing testdep activesupport
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' -e '/History.rdoc/d' Rakefile test/test_helper.rb || die
-	sed -i -e '/rubygems/ a\gem "test-unit"' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-	# FIXME after activesupport gained ruby22 support
-	rm test/time_stack_item_test.rb || die
-}
-
-each_ruby_test() {
-	for f in test/*_test.rb ; do
-		${RUBY} -Ilib $f || die
-	done
-}
diff --git a/dev-ruby/timecop/timecop-0.9.1.ebuild b/dev-ruby/timecop/timecop-0.9.1.ebuild
index 192c343867c9..19d7745b7f4e 100644
--- a/dev-ruby/timecop/timecop-0.9.1.ebuild
+++ b/dev-ruby/timecop/timecop-0.9.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/travisjeffery/timecop"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 # Missing testdep activesupport
diff --git a/dev-ruby/trollop/Manifest b/dev-ruby/trollop/Manifest
index 5fb006fd8907..e74b11b7173e 100644
--- a/dev-ruby/trollop/Manifest
+++ b/dev-ruby/trollop/Manifest
@@ -1,3 +1,5 @@
 DIST trollop-2.1.3.gem 30208 BLAKE2B a5fd19679821c55459cf7792f3ec26b8580732e84107f7a3519dcbcf1729ce48567ca2d35346b3e27d3083a3b6cae160ded8c18a118cb04a7a6e60c82bd91e78 SHA512 4d172c6d75f40edb36c353d2e32afce10b012f02927772fa201256126f88c62adce39400225434a80fd678e1cad703e3d3f32cdeddd150287a44ff81a2fca819
+DIST trollop-2.9.10.gem 29696 BLAKE2B f69b1ab8ce166f9fe6198e177266ee86e38f3bed4c3a55529705aedc4518cc04a48b9bee4463887fc4ac1cd04cad98d35c298265ad1433ced11e0ff5bc1f50ce SHA512 21a0db09d480353ff846a1311b118e0b0db4ca13a559dd1749c1478eff7080dd04e5308dbf1807215eadb68e276c991970b23357e9a3497acb9f705f7f77253c
 EBUILD trollop-2.1.3.ebuild 735 BLAKE2B 90e39fd42fb986dbc6cdaf01535d720861873844d56dd72523ea1b6c02041c8fd4f2f30f995f66db6f463f1f09ce549826a0495769b36a4983ec89e24873b35a SHA512 3b657696a077e19b966148b06218aafafc7b62de7166588ac3a6fbbe4f98e4771d08e9fe447c4dff496b3e7c5be94a1fda4d9e6438e6041e37f31c7834400121
+EBUILD trollop-2.9.10.ebuild 705 BLAKE2B 5b223e863c1403d528445d8b0da47756d967465463e11a6ea81beaa46360c478b069670c743a9226ac3ff1cd14602e8bbbde9dde3fa8b596627bc404750cd371 SHA512 8c8061c05b6eea7afa76c48bec6b1e68738a1aaf997848a8377ed1da057f21375a044fec9381325fc51ee97c1a17516f33332cb3114152ed731f0e14c4bdfe36
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/trollop/trollop-2.9.10.ebuild b/dev-ruby/trollop/trollop-2.9.10.ebuild
new file mode 100644
index 000000000000..5a12cb710493
--- /dev/null
+++ b/dev-ruby/trollop/trollop-2.9.10.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_EXTRADOC="FAQ.txt History.txt README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Trollop is a commandline option parser for Ruby"
+HOMEPAGE="https://manageiq.github.io/trollop/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="2"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/chronic )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundle/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	MUTANT=true ${RUBY} -S rake test || die "Tests failed."
+}
diff --git a/dev-ruby/turbolinks/Manifest b/dev-ruby/turbolinks/Manifest
index 14ab31cf79d7..717008a54e13 100644
--- a/dev-ruby/turbolinks/Manifest
+++ b/dev-ruby/turbolinks/Manifest
@@ -1,5 +1,3 @@
-DIST turbolinks-5.2.0.gem 6656 BLAKE2B 7a50571a24175fc5e2c186b79fc40dd9f7a4fc3eb162b64a6b9656bb0263a25e2053bbf8685792186e5aeea8d9795e1a98e0c97e4a3155760a9b7160496b5c79 SHA512 dd69f6249463844da655ec57db34e55fe7e9fb43d2cf0eed87d20deb578ae9f84541b80df00b0f056da7cbea6b3fda3d55bff10c3e7709c50f98ef543710cc7d
 DIST turbolinks-5.2.1.gem 6656 BLAKE2B 55f624ee8dbb8d27ffe21fc4b57644ad3118dbf7d89dfe59dde1909ee553d37a47e127af92e710f5081787e682b76950aac4287b604ebd9b32df4d60ededadee SHA512 e306a38dcb727a9ca9f491074154d0e82a6a0efba89aa8aa6f5db97c0c78fb468589a54b28779b83b5548c92aa03976e27a98b4beef0ef376606a97ac9dcce59
-EBUILD turbolinks-5.2.0.ebuild 467 BLAKE2B d7c533815c45daad782fb2755365740646cf7e3f1003e999b73481ccfbadab1faa6f6ede124fb198f4e1515f461047bba823cadc12f25b92337b03da1569b932 SHA512 6364dd4e94480e4c3830954eb712451dd57cdca3191a237eec2eeb90d82a9196a8753778e9f8c15c1ac42d5b02b99deeb4435a3e3be71ed45187089d89f97d6e
 EBUILD turbolinks-5.2.1.ebuild 436 BLAKE2B 1f6acb76446c4d6c40e7f7ed86586263273c5b4dd6a74bf1b8843403405afa267ed6f1dd731c2b66521433e2a632bee32024fd2c239adcaf7bafd182305e0189 SHA512 c2514ef06c81076c46cf802973512425ac91b76ce1fc641186135a564478d05d510048400c49ef0464f4ad6161f6284229a62198481b3a299ea2ee326e158484
 MISC metadata.xml 342 BLAKE2B 6a78075d284b979777608d6701b92ffd1b4e72af314ce5c49a1f975615379fd976031455feaa2e6efb14289398d434642b6b2b6e8e037c4ff69226649247a9a0 SHA512 3ea14f0b2b2e0ac563e97ef9eb9ea84e6389dbd456655f344a9cfd4a7a9d24eeb3eaa4fbbe30683cb7f7adeae9c51d136a5a2174cca6ddc1e0d7b31d380a66ce
diff --git a/dev-ruby/turbolinks/turbolinks-5.2.0.ebuild b/dev-ruby/turbolinks/turbolinks-5.2.0.ebuild
deleted file mode 100644
index f80db61b833b..000000000000
--- a/dev-ruby/turbolinks/turbolinks-5.2.0.ebuild
+++ /dev/null
@@ -1,21 +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"
-
-# The gem does not contain runnable tests.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Makes following links in your web application faster"
-HOMEPAGE="https://github.com/rails/turbolinks"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/typhoeus/Manifest b/dev-ruby/typhoeus/Manifest
index 73f3a4a3ce25..c23b3c9bf8ab 100644
--- a/dev-ruby/typhoeus/Manifest
+++ b/dev-ruby/typhoeus/Manifest
@@ -1,5 +1,7 @@
 DIST typhoeus-0.6.9.gem 49152 BLAKE2B 0c80c76c6ed8e9e564d6fc48b259b6c1d9c5c4422d29ef356fb092dc722e96afba319e682f5548603f1bebce96aa3e616161a5e036a7c23264b98835c41955e0 SHA512 5063d3217f35db29d216327b6eed10d6613d018c496935e78aa8e2b10ec21f3372df11fe48155b45387767d5572efa93e74afb0bb9b10782d28e87dead0294a4
 DIST typhoeus-1.3.1.gem 55808 BLAKE2B e3153870bfe2d5187aa433d81a287c2f9e9e6cf3caaf52b0f542fd35e4ac812786abc389c47ab56dd4267adb5206a5ce25c5ab6cc8559fa8dfbbd6b78e53fc16 SHA512 f826cdb7e48577226b12fc2715123e13519148f67d036470e385f80f8f3112d1ad24bf580c2ed0d213242c9afc1bdf868084266d430858b2cf6de73e50a11422
-EBUILD typhoeus-0.6.9-r1.ebuild 734 BLAKE2B 958f34eb6402d828a96c3a699cb20449e1d234ae32b49204b33e656d8e69dc9529cfe6a5e8520d158385a4b246fc0bc7e6af8cbad2ea3f2394a030dc886be790 SHA512 4e3175dc69b590ac4e43d309a75350332350919710451435e2e6791b27201380ea0429bd8b68241a109807e2fd1a3deb4d81827b7d0e4472889adf832ab8e6d2
-EBUILD typhoeus-1.3.1.ebuild 779 BLAKE2B 51819cde9c0324232ddfae9d0652ac2afc42daf882367012edb0b4b76757489076460fe97ecf593a8c4273ce1057e4211b5638c2b5e5f461db2befe8b47d55dc SHA512 b6e493bb8cdf94f9c21d57baf3ef38781864a5dae78e724416565e280501109ddf1546a1bd9116a20a43b5b9caf9ddc83efa5e8700653bdc7c7e80b57e987db7
+DIST typhoeus-1.4.0.gem 56832 BLAKE2B 1f188a2c174a9d0e2cc0afc10f96d98a8c78278c1fa53eeb88da6f4f3986c8e204171a9bb817c95a217360346bda319711e7c89095ad48e878cbc3efc21e9887 SHA512 f48a99fd554f4d06d37a0a804ee79dd8423d9bff765394537ab0edba615e132d25660a6eb455e8628f59bd56c7ea26f4a195827d5287a53e58e3aeb394477284
+EBUILD typhoeus-0.6.9-r1.ebuild 741 BLAKE2B 84ec7c85b6b02d12e00205f961cbd2ff5d51003510c8a70a4d667233f8e1babd01e68938e394d6327ec183f7aea4de448c90a6df74bf7bba7bcba6607998ee75 SHA512 1a38f6b16551e08913ab9d194723403ac56893606ff496346c0721ef17ce6d2217f4a08b6e7719a206d83786eecaeb1fb8d38e3760080d6cc5cca1171f39d93d
+EBUILD typhoeus-1.3.1.ebuild 786 BLAKE2B d4a5cf7d5237d3ad99b38fadcc7fa8b6d6b485cc37775221e837f71f4ac81ced22dbf93e8682dcca378a7511ec3fbd9e11811afd6bb8a86125a45b1b0580a7d4 SHA512 f80d6545173a9a4ddd27c091e1ba55275f2ed7bdff6419d7e8b1ff8131d230d930936d52afd9f39d77d0c99e86000e384fb54ae347aba64573784869b0348449
+EBUILD typhoeus-1.4.0.ebuild 786 BLAKE2B 40f894831adeb5e8a40e6c34b1478500eea45fcf9f4f55ec4f5a1ddc78bceec5670bf7f4fab6e5f59fa5c31964e9b20004375cc860e8af5181319bfe1afee687 SHA512 b744bfc7b970aef3fcfc3300abf5b6dcc4d0f0d085cfa7d3e7680fb1eee0193bc8b4c1c5c5c2d00b9a2ae3e106a57fd7bed5ad97dbf3a4c890cb5105089080af
 MISC metadata.xml 383 BLAKE2B fc06c06493e84a900ad29aa3997b8291d86a81c5b980c20f8abeb3897bbe6519bbfa5681d53df1629590e353f78aa6e0ecad3596cd6976a07302ae757f30f371 SHA512 976c74c44bb50748aedfeb7fa8a4b5f35afcc24cd962ef0441f0210f14da52121531ab23072bc8fabad9954b3bb384fbc4ae016397653b1e152434288fb9b6b3
diff --git a/dev-ruby/typhoeus/typhoeus-0.6.9-r1.ebuild b/dev-ruby/typhoeus/typhoeus-0.6.9-r1.ebuild
index 5e09b760aef8..00fd07d567fa 100644
--- a/dev-ruby/typhoeus/typhoeus-0.6.9-r1.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-0.6.9-r1.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"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/typhoeus/typhoeus-1.3.1.ebuild b/dev-ruby/typhoeus/typhoeus-1.3.1.ebuild
index 049e000a88be..f351f3b1aade 100644
--- a/dev-ruby/typhoeus/typhoeus-1.3.1.ebuild
+++ b/dev-ruby/typhoeus/typhoeus-1.3.1.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=6
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/typhoeus/typhoeus-1.4.0.ebuild b/dev-ruby/typhoeus/typhoeus-1.4.0.ebuild
new file mode 100644
index 000000000000..ab55524ac1c2
--- /dev/null
+++ b/dev-ruby/typhoeus/typhoeus-1.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md UPGRADE.md"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Runs HTTP requests in parallel while cleanly encapsulating handling logic"
+HOMEPAGE="https://rubygems.org/gems/typhoeus/
+	https://github.com/typhoeus/typhoeus"
+
+LICENSE="Ruby"
+SLOT="1"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ethon-0.9.0"
+
+ruby_add_bdepend "test? ( dev-ruby/json >=dev-ruby/faraday-0.9 >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 60bcffd1d194..eb8dfac1c336 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,10 +1,10 @@
 DIST tzinfo-1.2.5.gem 153600 BLAKE2B 3df5625c61eabf94bb457381ac7d0cdebd5b55da3bb043fe58063cccccb623b502e026a71faef4f7d7efe75eae2fdfd0bf3e0b97a3763fec9a1018f0c6c2ae0f SHA512 87f7cd66d6e80d51d216cb993cc76fe7758db03ffd39dde96eb24a9d208699766a8dbff048485fb732ce125ee9f971e38ed9ee1197f3ee3fc3ee8a8da840dd45
-DIST tzinfo-1.2.6.gem 156160 BLAKE2B 5e1459dc1a22e22e585f29f2ee71e5306017a04a75233f7cfdf0e54a3086b69e6d216c73f81b358e2b8aaa6898d3826f25c860f88439ed9181811254e7823943 SHA512 2ab5bdcb0c2d3b0dac801533235add47a9aea3f5c550874b5b66498c4ea065a2af826cd02334ce0841ebab4a543f9259433a712f64b2b7d858751854b8003b2b
+DIST tzinfo-1.2.7.gem 156672 BLAKE2B c1b52d2ac03fa9d11b68579931991887f566e3cb269bb5eb8b66c3a636decedc99b1729504c6941b260af9415815f5098fb3bba29ac7585da1497eb0fa7efba7 SHA512 dc8d45b09e4f77e5b6f17c9f707932554fc8be8029a9641d82cb8229d764c35522b2d20cc34d50a52835d148135e39a0dc91a7c2bac3eb5077057ac06d67f3bd
 DIST tzinfo-2.0.0.tar.gz 210379 BLAKE2B e3b8b7763dbe26ce58b1a1672d11c412f362910d695c321e51a9c28f1e742db34aa7c066827d7a4634e4a1f7824205007b66191cbeba7776dbc6cac1c9f144ca SHA512 cdc3393af8402dbde491f4547a1b169d90bcf7228c89b64f104538223fcb8f5cf8f7861ae1e11a723b213de7ab09fe31fc04ed9f275f80fe2929f0279d830679
 DIST tzinfo-2.0.1.tar.gz 212477 BLAKE2B 95a7ed460054d258485e24e63140853218ba00a7e3afc0c0ee2be5c91ee66588aec663a17d50dab7237b0091d0f423a845c474b18873a2a8153db2745f8fc1a7 SHA512 9cfd0a076aba5e7ae2f519374a6154a62e3ec71eaeb2d5a31bb07e3e26b44c4e01fce8cb385e0da9c565e0e408a0a7f204ac666baa7a9d6f3a592f2218ef99b6
 DIST tzinfo-2.0.2.tar.gz 213501 BLAKE2B 7886ba84257b85104073445d0948fd5f58985fa0f5f85c1ec15978c6f497fffb9bd997a0bae1313d697115c487c069dda1b7e5dd4ec2c7580951d0a8ddf8d623 SHA512 a0c71dd9299e84bd71a91858ba8c12a0ba00c625219da1172d5cd1dfd35318ce8a83e59f45489c2ed5161761e1c39834ba63dbfa189acb100ba37ceae842668d
 EBUILD tzinfo-1.2.5.ebuild 1061 BLAKE2B 27032d7fef1d0e7405fb48ae19aa59627a2a6ce6bdfcfaf784a56cf2af04ecd7b6267fe08309311de573dd4a4a58c6f210acd5c501f1665f7e2e03777fc8a148 SHA512 228555b2f7677a4ba855162d8ffc0005454a5c59edebcd1dbf2cf9e6ce49da747d26a000e6db4a98d99e4c187923b74d7ec4602fc8c1c953e629ce9c1538af3d
-EBUILD tzinfo-1.2.6.ebuild 1039 BLAKE2B e748627f2c1343d4b0d679c6d20030a9a0754ffcee0dcc2ae862ecb9dbdf4a885ed65e8dd8344473a25cb7c1f4f70985e280a68264a780071ba323d80d2943b9 SHA512 2a4b183da91ae08db60054e396f9c849e715633c1c2d7f3e02dfeae17b867d9b82650667f992507445e48980106380f9fc3dba7814834c5f5395ad50dadbeeeb
+EBUILD tzinfo-1.2.7.ebuild 1041 BLAKE2B ff9248b33054054ad5a24df6df40456ee4c47f985dfb2450e10117c612fc1680a0523021a71e41da676d8161257a0c4f6dd7b88108eaac9163a3ff8835d93e4d SHA512 909f0fe46a327691056eefefc5ee0a40f360e308eedf14336c57c0980b381325dffc5a26f8f5418864e3e7e5def53154a473560a79a83c753e10306dfa8e076e
 EBUILD tzinfo-2.0.0.ebuild 1421 BLAKE2B 5f67badde2286da4ba2e8214ce7319d0f3e7c814934cf0a6ebf6c7a844192b6d3fe470448494ec54c372dfdb9b82d177542be8ff8e4a3aa118b6ce846a136ebf SHA512 09d580b8daf8aa3412bb512f3f5cb92cbcb8bb182cbba14be4086af09eac65c071c50441604e4a36c13787ff64f2b228531b3a923150adc8d08b11853529559c
 EBUILD tzinfo-2.0.1.ebuild 1436 BLAKE2B 46069296c733f7968826499a3f03155ac027185e9961993ec49ab20e3d79b74c694a2f7a5b005285a6a4c18cd1aaec6f12a1d172a21679290a6956b053b7d446 SHA512 cdc9d83064ea1929179081f6849e1c857e9ce5db2209ff7b5c6c9faf6415b0d7f8cf754e0f205baa422e20af44b02b9e44e29bedd827f59bc4fe8f642bcc6b2b
 EBUILD tzinfo-2.0.2.ebuild 1436 BLAKE2B 46069296c733f7968826499a3f03155ac027185e9961993ec49ab20e3d79b74c694a2f7a5b005285a6a4c18cd1aaec6f12a1d172a21679290a6956b053b7d446 SHA512 cdc9d83064ea1929179081f6849e1c857e9ce5db2209ff7b5c6c9faf6415b0d7f8cf754e0f205baa422e20af44b02b9e44e29bedd827f59bc4fe8f642bcc6b2b
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.6.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.7.ebuild
index 52b329ffe5ca..61bd4fe80efe 100644
--- a/dev-ruby/tzinfo/tzinfo-1.2.6.ebuild
+++ b/dev-ruby/tzinfo/tzinfo-1.2.7.ebuild
@@ -22,7 +22,7 @@ IUSE=""
 RDEPEND="sys-libs/timezone-data"
 DEPEND="test? ( sys-libs/timezone-data )"
 
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+ruby_add_rdepend ">=dev-ruby/thread_safe-0.1:0"
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index bfad74c98e41..9e0fa610809b 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,8 +1,6 @@
-DIST vcr-1.11.3.gem 87552 BLAKE2B 296651072c30cbba3bf329a9cf2d5eb743f8250fe250ee2794883de2ce7b99e6b4dba06f868bec3b78d7ae8fbea0624f628ebfa48239b36bc0413e3c55339168 SHA512 0d62b0699e42484a4ba385a2ec653881183b44d85fd46ffc1ea693ebb746b225566cdb2799cdb60235c24adecd7575e0f20d743968326eeeb5b24fbd3232354a
 DIST vcr-4.0.0.tar.gz 146920 BLAKE2B 19ae33d2f40821d2cfe5c0fc55d5e91e02b8e6ba2bba000c326d993987fd641dd5b4cedd6a8a441f86664ecb67dfe2501d335936af9271fa83aef6dc001b12f2 SHA512 2f98eedd021f7c125fc3f29189190ddc817bb95fc8e8e0ab53e65eaf94c5c0c41f3ca4abf9d829591acdefe97b931943c47129f95c21f2ef590ed500cc6f56f9
 DIST vcr-5.0.0.tar.gz 147602 BLAKE2B 031c9a70c9483b496ed3cda1c65138d214c257392aa5f9157135b0fd4c33d35dd6143afc0e775c5061bb823d936d1bdaa084eaf0024e87747e6101b582d8bd1e SHA512 88e4d82f1c5b3d48c89a75324a256c66858740d2889a4d86851ebb3a303745829e42f20b20d4cbc18d7b0510eb0b229a770bb6209be93dbb8c8b0be84bf5f645
 DIST vcr-5.1.0.tar.gz 150438 BLAKE2B 615a0ce570da29be402f97dcba1ba987c611c73cc9ebc561683333c752d57c1c2f0acae78b42164d8c56f71cded150a93566d45c0c84153bdc3dc8bb37199e4e SHA512 5297e46b1ffe31c3559df57f0af158cb8064ba48b83702ea3bf12eca4c7260bcb71d3df7ae645a3cc14817366992458beb4fd9771c1f98a56835dcd69ff107f9
-EBUILD vcr-1.11.3.ebuild 616 BLAKE2B 43e01aefa94e61ac8dcbcf7a8d09a69accac5d03528de23a2d0b6b73e2f5e015da18439fe3d4ed4fb777e31a57a93fcd69f08d5d40c2abc3d6f85fa42fcd4694 SHA512 124cb0aa340da7f76522502030eb3449da6bd013d641c23b455775f2f54f58fcfa10342d4b6edabe0d522e8447d402009d0215f20ffa9e79763f1234c2876bec
 EBUILD vcr-4.0.0.ebuild 709 BLAKE2B 360617e1a7aff37a255ea03f0af132648408024cbabf3737d85930124c304191824046d0290bedcadffd06cc48d0317165868e4dd970699eca76a70e7b0d9985 SHA512 e8424a267dc567b63e3d9d9da1214b3dcbf03ad3992f5e17dd8bae7436f70a8b0c5781455dee1832dd3cba67aca243fef7fb5159617ee245652ed8eb93e3d216
 EBUILD vcr-5.0.0.ebuild 703 BLAKE2B 46bf583f4250d89f7c4f8a189c7640fd8f5618ca9f5bb90964fd424dfd69977c561213aaf6417dca4f9c3a5a05f352ff854d0d5a5a9be02383016d780a6cf81c SHA512 ece96b85a4582222de655644e7031647149b6a21a907741ee80f139001352c36cb3ef1551256fd3602cf4982ed15347ee34e0f1e2ebf75bf4f45d843f5dd7245
 EBUILD vcr-5.1.0.ebuild 732 BLAKE2B 215ff9e86dd92891f4cb4d036c8d648bea16e8db53ff21927bdd696e466bffe37fb23939da819ef774e2a42d67e6f54c8dce81124cf9156950d5b9804eb27812 SHA512 d6bda4a9ecfff4963ccba5f78cd11a0298aab9521d3e23949b3f259498d23bf51b24c49361f95e931265e45bd7c68c21b97ccee4fc9140ee576daa59911923d0
diff --git a/dev-ruby/vcr/vcr-1.11.3.ebuild b/dev-ruby/vcr/vcr-1.11.3.ebuild
deleted file mode 100644
index 6801924a8456..000000000000
--- a/dev-ruby/vcr/vcr-1.11.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ruby25: code is not compatible
-USE_RUBY="ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
-HOMEPAGE="https://github.com/myronmarston/vcr/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="1"
-IUSE="test"
-
-# Tests require all supported HTTP libraries to be present, and it is
-# not possible to avoid some of them without very extensive patches.
-RESTRICT="test"
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index 978c4f33dac4..313147c5ab1e 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,7 +1,5 @@
-DIST web-console-2.3.0.tar.gz 47641 BLAKE2B 2756f3958ea77df7dbdf7e7bd79f64711b4f958433f347175a29db2272ba549c79f1f94e2be18c17ceb8f4f1e8d281cf09995354f6ccd21da314df14dde886ec SHA512 36136242012053c2049b0faef682a8fe79f931904cd1007a6e08f36aca7a8923fc47fc058304f11cc0b205db876ca77b1cca65048c8ba4db401123ed9c05c834
 DIST web-console-3.7.0.tar.gz 53714 BLAKE2B d69a7b467e419e87d43c988026f278aea5ca142e336d120e0a50ef85b36186d2f388d551f19820e01d85fdca5a49c471aed69cb2ae0d6f1828a99350dfe86d55 SHA512 d44e4dc3ef12216829b3f522e3645b0fa9b8ae34fa70b5e52a96e345b8b5fc8dad9af6f9918ea23d276cae03445133b15f780041a8cb61584b182ca6934fd71b
 DIST web-console-4.0.1.tar.gz 54076 BLAKE2B d1c93d828f7c0c33edaac664e2f763aff55bd8437c3f8e3b20cc5c065129a0b213234ea372147d5d6df0917d17cc458e63dad1aa64f9cbd67fbf0a02ab631c5e SHA512 7f2d931b94fc2e51edd28ca0f83473c382bd7ade6e425dd9c79770885efcdfbcf6a3a3223d36572d749da15b05126fd287412d2365d9faa33039de4bcb1c9b27
-EBUILD web-console-2.3.0.ebuild 1121 BLAKE2B f7ea78faa544059960c0c72171b3cdb331acad11fb34116e93efe466c7c2c59f599acf7214f5ac5dba2e2c52d4ca7c8fdc7d3236622d44f98afb4ec4b2572728 SHA512 63a710dd361dc67eb00e433023f74184754776caee0d9d7ea52c4cbf59d292ea1206c456aaac68f88b0de0ed20dccdba7d769a5e4bf4c2ad8173ee0ba6b90f1a
 EBUILD web-console-3.7.0.ebuild 1074 BLAKE2B fa1096afae3683ea0da7c0b2d61fc8768f434ba81c805266933f6933c9d345137962abd841d3dd2be17746377666891eeefaeb886a8e55daa1ac2e8c2ba73371 SHA512 d9a93f155a46de6c0c4f60913c85ef874e42e69805e7fea050eed92f6e2542e50061a07694482cf609fdd70bcf044ca1ac03ac2bc5f92a190ce2e219b9aaa7e0
 EBUILD web-console-4.0.1.ebuild 1071 BLAKE2B fcba218fabf4ee60a81d088cc159b373212ea4d6effc121ff1c7e8e2f9ea434efe1674d6ce23c886dbb267660291759a7ea6fef3d52de9441091e67f7d0175b5 SHA512 41470af754e173c258fc1571d9537868cc97b22be59c3ead88295eda9ee80e4791d22ac999b86d9a60ca732593a60342cab7c67e138b9b8c73bd1480a16080de
 MISC metadata.xml 343 BLAKE2B 8883d76dc0b31bd49361ba715fc9546328ba5a3fc734e8a2607547cfde3d8b48914231839f0ea3d4a59f005a5074770e1dcdccc6b5d629197c8f7f859453f178 SHA512 9116cd6bba4d0030e6f8cdf055fd66afed68c52d9f5382a8a9cd2cb28f84c3f397a3e793dfef3b5ee0fc9e1a4dcd1c2d6e6b285fd7fbb027e339e2d15a0381ad
diff --git a/dev-ruby/web-console/web-console-2.3.0.ebuild b/dev-ruby/web-console/web-console-2.3.0.ebuild
deleted file mode 100644
index f7bc2da2f20a..000000000000
--- a/dev-ruby/web-console/web-console-2.3.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A debugging tool for your Ruby on Rails applications"
-HOMEPAGE="https://github.com/rails/web-console"
-SRC_URI="https://github.com/rails/web-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activemodel-4.0:*
-	>=dev-ruby/binding_of_caller-0.7.2
-	>=dev-ruby/railties-4.0:*
-	>=dev-ruby/sprockets-rails-2.0:* <dev-ruby/sprockets-rails-4.0:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/rails:4.2
-	dev-ruby/sqlite3
-	dev-ruby/mocha
-	dev-ruby/simplecov
-)"
-
-all_ruby_prepare() {
-	# Use an installed rails version rather than live source from github.
-	sed -i -e "/'rails'/ s/,/, '~> 4.2' #/" \
-		-e "/'arel'/ s/,/#/" \
-		-e '/simplecov/ s:^:#:' Gemfile || die
-	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index e892895a1c0a..365ef2c37ffb 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,9 +1,7 @@
-DIST webmock-2.3.2.gem 112128 BLAKE2B ef0a722374057d7c5392924f68de8520f08cb0aa038fc0b8511e00bbd9dc13f6535955f77611e414a33dbf0ed7a519e9c18caf8517d10be7438e7360c3037a1e SHA512 bb61b645b287d15690aa81db4d4c937d3456e1911d394ef1fb31e8ff3530d47b865aa039c8aaa4d4b6a72132dfcdd06be66adf1b53793384dc27ac1c9f9c01e6
 DIST webmock-3.7.6.gem 122368 BLAKE2B 9bc40971f1eec96d88217544acc67b7abfe6c0815a0696119e12fc5629b4f51e1164ecc982525d2c02fa50c7b1b09548c4831c1d597f06acde04a83227ba0dc9 SHA512 85455495476b22d94b23e34a92db3f0f8cf1aa5bb52ea6a8eb71f5f0bcbdad1edc13dff778c62806ec27850320e9f4e17f12525bbac552e5e105ee1ecd771efd
 DIST webmock-3.8.1.gem 122368 BLAKE2B ba956c72f20e2c21cea90b107ef445e42a6995fdb31f9af65c3b561e9e1fbb9fbd299db009a1d83ddfdb473ce030d40aadf6633e23afbd072ee3b4debf7e0be2 SHA512 b1137fabb000469ee88fdd5521756f368463ee49988d5d89b51fa8352362ff249a4849159504834933e5e1248ed9b6791d254528b3cdea461fc9e8e5d92a334c
 DIST webmock-3.8.2.gem 122880 BLAKE2B 0cd10f391377749c6420d08434c8e66230612c50bdff86b4dfd098690c006426e241c32bf716e2f8b9ee6c0ce6488d1975b54f3e4cd85cc14d6c7f0880f65701 SHA512 ae6bdda341bea804257d9f9b57d17a65a25d030ee2f5a9b7fff125a5f7881a34584c6b5d26a1e6dd5a49bba56ad5b6e731defecd109e19a5144df4caf90561d4
 DIST webmock-3.8.3.gem 122880 BLAKE2B 66371028294f3b15172d718e0fa9402ad6ed1bf7beedb0c62621ad31758d25e401af9cd982a6f29cd1161a7e4d7954f6f9df22ab2e0c44c970a0edca3c0f1304 SHA512 6c845c4ed0c82ba4bb1f32d0d87a87eb945c54e159317aa14e2238b497d38282b7e81542e78c0d68d4b8d4a08e46137de84503829b7381e6d945e45474ebb507
-EBUILD webmock-2.3.2.ebuild 2039 BLAKE2B aaa37b9bf42a6e40ef0adf60d223604cacfa7f51d425885c8cb04de5932d9b1ccc295e6a7c5f5eb930136e2c45b0a1703651ccbc2c08b2ced92e174729577d61 SHA512 a49f721d3c4c2e29a007aa82137b345aff64f47ba332c8fad9de652a1220d082351f2a25dd232d42b26671610d4fe1a005c3d163ee71d6d1714667985980a505
 EBUILD webmock-3.7.6.ebuild 2070 BLAKE2B b4f563812263abafd1b423cd721397c6995c443b04690b8eb2185d5d43bf3215d1986ebfddc5d372eaae9826a3e5d099418078d03cadcd075f4ac93f61b25bf8 SHA512 ad6dfcc4b637df478a294f0915199b02b71381445a11a7b63fe5a01e98ce57b8883bfa679f62c1abc625636e36b2aba1088f3e9ab0e22b471c33d038d2efc21f
 EBUILD webmock-3.8.1.ebuild 2071 BLAKE2B c1344b73dcd9db0e7f6bcc0414e7936d69c16036fbcad709c8b28cfa6634f201fa7efc80d0545c02b81a1dc1ea6c405367371d3cf59b8dae66d9ca96c3478c52 SHA512 e10c709f08079c668096bdcc317c85d6fb80f655502fc33e003bdd30b8a4190b0621925ab0700f5abf610575dbcce6c60825fe0a64ff0f3df3e259318825d4c4
 EBUILD webmock-3.8.2.ebuild 2071 BLAKE2B c1344b73dcd9db0e7f6bcc0414e7936d69c16036fbcad709c8b28cfa6634f201fa7efc80d0545c02b81a1dc1ea6c405367371d3cf59b8dae66d9ca96c3478c52 SHA512 e10c709f08079c668096bdcc317c85d6fb80f655502fc33e003bdd30b8a4190b0621925ab0700f5abf610575dbcce6c60825fe0a64ff0f3df3e259318825d4c4
diff --git a/dev-ruby/webmock/webmock-2.3.2.ebuild b/dev-ruby/webmock/webmock-2.3.2.ebuild
deleted file mode 100644
index cef9721304f7..000000000000
--- a/dev-ruby/webmock/webmock-2.3.2.ebuild
+++ /dev/null
@@ -1,63 +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_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 dev-ruby/hashdiff"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	>=dev-ruby/test-unit-3.0.0
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-	>=dev-ruby/patron-0.4.18
-	>=dev-ruby/http-0.8.0:0.8 )"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' -e '1i gem "http", "~>0.8"' spec/spec_helper.rb || die
-	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old.
-	sed -i -e '/\(curb\|typhoeus\|em-http\)/d' spec/spec_helper.rb || die
-	rm spec/acceptance/{typhoeus,curb,excon,em_http_request}/* || die
-
-	# Avoid httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-
-	# Avoid specs that require network access
-	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/xdr/Manifest b/dev-ruby/xdr/Manifest
index 51b37653cb74..2dd18f06e956 100644
--- a/dev-ruby/xdr/Manifest
+++ b/dev-ruby/xdr/Manifest
@@ -1,5 +1,5 @@
 DIST xdr-2.0.0.gem 24064 BLAKE2B 183414b9ef719784729a415adbf85889abe30dfbbc1a7b988a01a841caba6c02c04563b01b5e101a0284729671d1957bfdd78d13781d619a1281f14476cdfa81 SHA512 9ba84364c7a4c52ce415361803491d514f9d83f59b7197301d0c4fa94dc715365a89f3a784a90ec077b54de6b6dd64467386c575b42de375a3a9af6a84a5d650
 DIST xdr-3.0.0.gem 24576 BLAKE2B a9366e5a8261dadfc71658e4a8e18b98f418d4993b6a25c3ba5fabc22557e1ba19954f4451d7d95598e9d1d5c597d484f763e6b1a4689740e782ec06ed0041f5 SHA512 8176378330d9060cf8abe0f9ee18f69682674c407934dcc01b76d561acc10a94b573db3b04a17b9940d6a5d1682181ad15147c3e3acce692a3ccb9e275ec0062
 EBUILD xdr-2.0.0.ebuild 628 BLAKE2B 8f79c84ad2ed022c45c0848b0c2c004a5a8eba25baf82c3135db3c3d92528e1edef990314994c75fae4437307631c1f312d7ff4acc5c53681be86e4c44228a96 SHA512 93b33f5f1c3896e4b7cafc9167273ed1d856d3570d5a6e4f5453e4da592e997f9424d20c847f322a0ba2410d45e9e4bf4c0b5770bb08fc5ac286d13ec4e481af
-EBUILD xdr-3.0.0.ebuild 635 BLAKE2B 3bde0070450dfb59fe0bccf9662a22be03126918b14c2ad75579454076570123eaa64b5fa31a5b2ddeeacf115cd44ebda5fe25bda602b33baabeff608327fe7b SHA512 22cbcb5c12433a1ea56c3bd8f2039a5605bf37b6fc99deb5156fb1df365cab9003664f8605ad7dd5c1a3da907be09e894c73a6305a9f9e9a2f14d5d6dcdb3267
+EBUILD xdr-3.0.0.ebuild 635 BLAKE2B 4e0f0f5fccea7a2fba9ecf348d8cc1baf03d45879e88ae0eaf1075a0e18d3112e0cc212938e0a95b6e7435d25bcd83b8b78b00642b0907cc562f4d7197c6aadb SHA512 f88adf806aec548b6b66568e49a1d647098ea5684242cb8cbafbaf2344229c04d99b9a7ecc1b9b4bef39f2493c326e704ac07be8ef141283e8deae60a68e88d4
 MISC metadata.xml 456 BLAKE2B f6aa70d7197eac15f8725062b5402f17019d2bc9a21be0544674e6518835bca312a913718ecf1ff5cd890e3c16662a0f8400ddc0d3e8350351099384fbd0a774 SHA512 910fa5da3fda7b30d725923c0dbe0b729af1337da85476e8f97e58d4e587930b738b9c7b99c35362f5b58f5a2fa01c5eeb5c46bafdf12c36e0f0a7dbc5ce8434
diff --git a/dev-ruby/xdr/xdr-3.0.0.ebuild b/dev-ruby/xdr/xdr-3.0.0.ebuild
index 3f0664d26d18..b961a2b074de 100644
--- a/dev-ruby/xdr/xdr-3.0.0.ebuild
+++ b/dev-ruby/xdr/xdr-3.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=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 87eaab8a4fb6..6c025822600a 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,5 +1,7 @@
 DIST yard-0.9.20-git.tgz 921130 BLAKE2B 37b1b2524147a1a8cb36c3835cce4e7666e2c8d3d5c187eb402000fb251df64111c4f104957ac9d28bd0e8d9328eb1d97571337ae54479626dcaab3cf07625a6 SHA512 b7e035a3598c8ef32fcbaae57254c0fb0cba875606b434571da2ef754f3171b5c42a4b3a45bd4bf41bce368f6fb7e448567f601a9cab5fbdae695bbec1b73608
 DIST yard-0.9.24-git.tgz 928072 BLAKE2B 33d0c3c0931b1234814651eaee674cbb18722b15674575860b57c2c7992d160ffe8606290a2c887e61dcf095230a8d98abaa2ac41c92a761272d64ddeacced9e SHA512 cf7f5973e03562c7081b7c213c6dffc01afdc1207f79f52fd51f7e6fd917cdc13e6b5b6e89c93dbe3c05338e3a1418e7c6e8d617e96613b8156b95868b60ce11
+DIST yard-0.9.25-git.tgz 930253 BLAKE2B 35531a7e90ab99bad8d236ea4774a8aebc50eff5d78f60e2dfea8edb2af965dc60e8c02f8a1f95166e80d6f1ce21aca051b92b2511b88a7d87d2cc90e58bcd17 SHA512 855bf05ce45a965d534191b036831ec1cedc848e21196ed93cc7984d744328d9d5ba39664b4539a707a1556984990360cd27e085b830501ac8d72c6cebb3e689
 EBUILD yard-0.9.20.ebuild 1796 BLAKE2B f80109aa77642a6b13b5bb13d750074ae610699dbc65fa7556e1b3c00300f65bc22faa1f8192d1e5c286e3f991be98aee5d025af486ef3717749e5fba87a4224 SHA512 aa284a792427e99a85e3a8a75f753ed4b5981fa35d71868d313c0011da98c03d041217e515fef256ca15ab69f743cda9b3fe7eb267507aed2b4cf3df884611c4
 EBUILD yard-0.9.24.ebuild 1985 BLAKE2B ca3c72673a8e9ef5032dee7ad1b01b79964dc44d336ca53b69edcf55306b0305be21b0ac4eb400a4e9a0da6881c571948e8a4fe7f1783c735f2b39a9bd19aab0 SHA512 43044bba52cb0f7ed596e43686d9a20de4c4f96dda4bf7126e3798e8b08aecbb2197072ba6cac05955106c9c0175fd2e484078bb78b52b470b234aac4c9c3fbf
+EBUILD yard-0.9.25.ebuild 2088 BLAKE2B 666086e76658dff59a5234e7a107854856f25f2bd68c6f6a8fd2808a9e76cbbe70ffbc6e4b5ac47d4b7bc376c2856792ea6de7c28dc25f64dbaff128e2b1e6cb SHA512 aeb3133862cca7efed5aee38d9f459038e7bce870968062bd6b13e16c6b9e98eb61c3d4e1e680bf087758b4e504b57c0a48a6cee14859d69d645368fa019952e
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.25.ebuild b/dev-ruby/yard/yard-0.9.25.ebuild
new file mode 100644
index 000000000000..929796ad647f
--- /dev/null
+++ b/dev-ruby/yard/yard-0.9.25.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 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_DOCDIR="doc docs"
+
+RUBY_FAKEGEM_EXTRAINSTALL="templates"
+
+RUBY_FAKEGEM_GEMSPEC="yard.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Documentation generation tool for the Ruby programming language"
+HOMEPAGE="https://yardoc.org/"
+
+# The gem lakes the gemspec file needed to pass tests.
+SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/bluecloth dev-ruby/kramdown ) )"
+
+ruby_add_bdepend "test? ( dev-ruby/rack )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e '/samus/I s:^:#:' Rakefile || die
+
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid specs that make assumptions on load ordering that are not
+	# true for us. This may be related to how we install in Gentoo. This
+	# also drops a test requirement on dev-ruby/rack.
+	rm -f spec/cli/server_spec.rb || die
+
+	# Avoid specs that only work with bundler
+	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
+	sed -e '/overwrites options with data in/askip "wrong assumptions on file access"' \
+		-e '/loads any gem plugins starting with/askip "wrong assumptions on file access"' \
+		-i spec/config_spec.rb || die
+
+	# Avoid redcarpet-specific spec that is not optional
+	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
+
+	# Avoid asciidoc-specific spec that is not optional
+	sed -i -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' spec/templates/helpers/html_helper_spec.rb || die
+}
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index 5f55ab8ed64c..71d7e94e75a7 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,5 +1,3 @@
-DIST ZenTest-4.11.1.gem 71680 BLAKE2B 27bd94ca98a6739829526c06689ee5a890aa254bef3cb7b7b02d79d82a4fa96faa1853d36069aa801983b4927d44b2af2c852c111ece3b64459c99d63a7a072d SHA512 6f3b5dfb8cc8154856e94f20134e9a6bd2d54e052d05d3e7a250f831ee0a3d3196b497cf118322c51201fb8dd30a05b8a0a0462c58a8852354c4dee2a10d867b
 DIST ZenTest-4.12.0.gem 48128 BLAKE2B 32d2d5cdd95b8355b31ce81957cad823c1d5209f0c24cbdf920fe1276d952df4995484af7e576e498273c01fbfb70eb5ed99271405977820f68cd8feac08d388 SHA512 cbce7059ed48fba1a265c9a4360d032492cbc3a67131480e11bc06c1cc7fadcd82139231f16c5ff4fd2a9b771a574f834a71eae21392ee5fdbf335366748150c
-EBUILD zentest-4.11.1.ebuild 785 BLAKE2B eba85278b2741ded6997e8e25c1c5c9f0429dd9fceb19fccbe13cca99a68cb8815359c0dd202461778988c55bed96151b69a0a9eccc917316986b54c033f5d67 SHA512 dd8e9e992366ca526e30c686523a2b2e37b216666b60764f5a1ae5d86a7f266c0e641f7cdb47f19ea70fdffaee05580381b5c20140190fdb79708e19c807450b
-EBUILD zentest-4.12.0.ebuild 814 BLAKE2B 0b95aebe088b77020984177cd1f1a11d425397b0a2b304e0000c8e8da6817aacea1cffc76ddba70015e652749eaf7991fb4e96bc6bb3b10b5280a47431c589d7 SHA512 9e0499955cae3447af524adee1170b696e68fee30c238076cd19f9e3ec95d1e0284cd09b6b968da2d14561f6f902097952e248babda6d866f3afc293d9da4dc3
+EBUILD zentest-4.12.0.ebuild 807 BLAKE2B 13a87ee24ea2680e45c17e682330836f00a2b02351aea3fc1df34360e1fea9106befe940bdd748d923d9de0cc20afb4284befdaf6a1aed9f38baa2905a518d93 SHA512 5543135cc8b9088f252327d9b17924cc11c37136da3b98b938d15f9c22352931166e9c7331c38128ee3a7b322fa5e1ae4f5e764501c27b24f4f92e7cbabf4219
 MISC metadata.xml 333 BLAKE2B cf1ac3fbb6994dc96110bdb974b726f53fdfe34db473f272ba78ede47b65e26350b807bf291c65f8a8bcf9e12fc3366e431ca32a277d9ac38cf9d4ed7ea46e62 SHA512 d02fdcc6c8ef63d22d0df77a6c7c82ac1d629d29685e6fc653c70079d56fb1b28574bfc7c372a5298dd4a3e20061aecc705d6824c569ce0f99e3dea464f04fcb
diff --git a/dev-ruby/zentest/zentest-4.11.1.ebuild b/dev-ruby/zentest/zentest-4.11.1.ebuild
deleted file mode 100644
index 04b35e32404d..000000000000
--- a/dev-ruby/zentest/zentest-4.11.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_NAME=ZenTest
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt example.txt example1.rb example2.rb example_dot_autotest.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails"
-HOMEPAGE="https://github.com/seattlerb/zentest"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/hoe-2.10
-		dev-ruby/hoe-seattlerb
-		dev-ruby/minitest:5
-	)"
diff --git a/dev-ruby/zentest/zentest-4.12.0.ebuild b/dev-ruby/zentest/zentest-4.12.0.ebuild
index 83b37ea24c5d..22022629ad42 100644
--- a/dev-ruby/zentest/zentest-4.12.0.ebuild
+++ b/dev-ruby/zentest/zentest-4.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::R
 HOMEPAGE="https://github.com/seattlerb/zentest"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""