gentoo resync : 08.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-08 15:03:58 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-08 15:03:58 +0100
commit: 814f4cf860e299a046b649eaee5463427984c09c (patch)
tree: 74c45f097899310e599dad6b8df5b63e0f085bc0 /dev-ruby
parent: 7f0ccc917c7abe6223784c703d86cd14755691fb (diff)
269 files changed, 948 insertions, 4738 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 83872105b6c4..41c957413a99 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/acme-client/Manifest b/dev-ruby/acme-client/Manifest
index 51718be8cadc..c5e241baecd3 100644
--- a/dev-ruby/acme-client/Manifest
+++ b/dev-ruby/acme-client/Manifest
@@ -1,7 +1,3 @@
-DIST acme-client-2.0.6.tar.gz 162500 BLAKE2B a32b2d0361d202a6a799e5ed61eb310ec51971a7a7e3e5747c0ca37a597114d1964cf336d053277cc45ae91640c706e39a1e70d5dfe77abea5bddd1055c5a0b8 SHA512 aeb2102971f4d09b07f7b9a793ce9a5e35bed77fa50f3c74558e85a81023e6ebe6317e56f5297e8b26fdaedfdb95041b73240a812d849828fdd99c4dc93684de
-DIST acme-client-2.0.7.tar.gz 177325 BLAKE2B 607de0c4512f4f369ea3725e8a4116082bfa6b069121c9a5af0cf893cabefc9eb0c05a581d3773f8e8d5023b5a250956b5d596c2c11bab116f75e3e35d96ac78 SHA512 1c77c3380e861976e7e3d1d05d5642fa9bd2275182a41a7de6645b07a61a4055b00cbc6723d633e939458754dbee88802793ad7de80163df9e713996c4e5b378
 DIST acme-client-2.0.8.tar.gz 182507 BLAKE2B 97dff7043079cdb0ae5d79cc376696e3bf5a02b2629d42aeea38ef50818f27fbae5a26260b5d680812dbd501d8c6fbe5a788f9f43020ef037a2393fe07379d91 SHA512 bdef0ec8345117af1c5c5c9172fe7e03dc19017651ec7d5a414e07d6c084b25d6999cc0599aca6eeb5aef90b144e7948de7e36d1aac3a2d5c3cc438ce9be6bd9
-EBUILD acme-client-2.0.6.ebuild 968 BLAKE2B 43870427ec3f23e90cb6c69e16baac817641c2860a0930accf3aa21a21075ae4722927002ce94ef8a7d890a458c62a0473b2fdd7887ac944f10d688ff47ef2f8 SHA512 c3b0ca3f9056f2fbc8d924acf2dc3d33d468a18c30a36eb97d097c38462b381178187d61a8f60c04d09df42e2235ef69339441f65d9c93d1e1549b6ddee764ad
-EBUILD acme-client-2.0.7.ebuild 809 BLAKE2B 60fae8740790a7bd14968a03b6c9a65de09c0a45b3d56c8e691eb037f1ffe2176dbf98db555fc76febcc705e3e6c34ad23411ff24164b6e4d0627b9bb9599740 SHA512 9daa30d72fb8ea3e157b1416667402cfe648b9879a32685950f2d2ecd9f22220782886d701bf79e4c32e7bc9e6f52616d9c4cbe39bb2f658d903c13720a5ccf9
 EBUILD acme-client-2.0.8.ebuild 816 BLAKE2B 4fb488c1d07919c0b80915cc5e9a8d2891ef0252a50aadc52e3e90153d6bc616825f27d419585e9b931a0e59ac9c56a2a0df076d91909a7fe85fe43343ab9709 SHA512 d6b4d7b7200006e7385d1301c899f9748507f720d120c349e089736ceef0bb4611bec531c0d7ff8974dda489b870b18ce69c20768b67ca566dcf907f7c52bdf1
 MISC metadata.xml 450 BLAKE2B 981b78d9bd544a21e79ee4cb05bcca1fa3d1c1b85191280a0dc6479c02b34b59fdaff4b07c6e1a30c0dde292374c1b11c69eb781fbe4ef0ab7e0b7bc9bfc1c59 SHA512 eef055abe907321efdcc317ccdb7613ce860e9e41cbf2eac0bde436ca41f6470de49400f837bd0bea0f98ce115ab27938acf95c926d18d1f80b415dd97cbefb5
diff --git a/dev-ruby/acme-client/acme-client-2.0.6.ebuild b/dev-ruby/acme-client/acme-client-2.0.6.ebuild
deleted file mode 100644
index 964ca35b2327..000000000000
--- a/dev-ruby/acme-client/acme-client-2.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol."
-HOMEPAGE="https://github.com/unixcharles/acme-client"
-SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.17:0"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/vcr-2.9.3
-	>=dev-ruby/webmock-3.8:3
-)"
-
-all_ruby_prepare() {
-	# Skip failing test where incorrect der value is retrieved, may be openssl 1.1.x related.
-	sed -i -e '/assigns the public key/apending' spec/certificate_request_spec.rb || die
-
-	# Avoid dependency on git
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/acme-client/acme-client-2.0.7.ebuild b/dev-ruby/acme-client/acme-client-2.0.7.ebuild
deleted file mode 100644
index 0ab0d2e5eb9a..000000000000
--- a/dev-ruby/acme-client/acme-client-2.0.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol."
-HOMEPAGE="https://github.com/unixcharles/acme-client"
-SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "|| ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.17:0 )"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/vcr-2.9.3
-	>=dev-ruby/webmock-3.8:3
-)"
-
-all_ruby_prepare() {
-	# Avoid dependency on git
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/actionpack-xml_parser/Manifest b/dev-ruby/actionpack-xml_parser/Manifest
index b6de4ab5b5b4..d3597c0f2456 100644
--- a/dev-ruby/actionpack-xml_parser/Manifest
+++ b/dev-ruby/actionpack-xml_parser/Manifest
@@ -1,3 +1,4 @@
 DIST actionpack-xml_parser-2.0.1.tar.gz 6494 BLAKE2B 271e1352085e7c75754253222c9f861f7ece9875102a0bb4c47e20311367fcc040c5680ad0406112f8e312c4a8ae1a3f9b6d33f3736db3614ca1c3584942f800 SHA512 a240e59178722025a0c967cfc2f63ca1ed8a2aff55ad913652f06018b712a7009eecd915f494dc4087de12ad5dbe5a0f3c7290fc530a2e475b39318520809112
+EBUILD actionpack-xml_parser-2.0.1-r1.ebuild 945 BLAKE2B 1cdfea88ddb72dabdf8fc04bb64064a65877bf11326659402d6e5b6de6beda6dfd3abb8e6c24d6a6d40a3de2c5bf412954a11756247cd07eff14967120250950 SHA512 84f98220c32b41ec0ee35547728806d6dc403d09bc0f7f2b5996567f57e7d4fc0662d0c5dc76eddbe729162304405eac1f330dbcc8d5abea8ecacdadbaeefff0
 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-2.0.1-r1.ebuild b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..fd564734e40c
--- /dev/null
+++ b/dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+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="2"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/actionpack-6.0*:* =dev-ruby/railties-6.0*:*"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" Rakefile test/helper.rb || die
+	sed -i -e '1igem "actionpack", "~>6.0.0"' test/helper.rb || die
+
+	# Skip test that is not compatible with Rails 5.2
+	sed -i -e '/occurring a parse error if parsing unsuccessful/askip "rails 5.2"' test/xml_params_parsing_test.rb || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:.:test -e "Dir['test/*_test.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/activemodel-serializers-xml/Manifest b/dev-ruby/activemodel-serializers-xml/Manifest
index a02e4d8ce255..0a9eb415b49e 100644
--- a/dev-ruby/activemodel-serializers-xml/Manifest
+++ b/dev-ruby/activemodel-serializers-xml/Manifest
@@ -1,4 +1,3 @@
 DIST activemodel-serializers-xml-1.0.2.tgz 23321 BLAKE2B ad626402acbf3a10a9b14a19713b3855e7eab69cd02ceb63386cb11b147c4c9dbc68dd849b9421b518bc70be29009f54f5effbe734e9c8bb1c59a7d2c3286ac7 SHA512 888db4822f9ed4fd17ba93f2e03e4edc204bc14f62e3622949140a3497f56ad7cd7d49cd7f38fbf557098ceed9f2f1334093fd8493ccc82e56be15f6bf138af9
 EBUILD activemodel-serializers-xml-1.0.2-r1.ebuild 980 BLAKE2B 6dca15e488973e7b5ca94a4c9b69895e68ce9a11b256c88e7680f70c8fa3093973461575994e766dc3452360202beb5bc4b3820bf529506ad54cdc740de80869 SHA512 cdcf0667a0a92909e0334de2568e7aa06bbfba4e1294024350ab1d0113e66a8dd441889a574674058c527aaa18fce13e7927ed3f4acac8beb5bc608f4275cf62
-EBUILD activemodel-serializers-xml-1.0.2.ebuild 908 BLAKE2B 1712ced62304a54a8535a0f4d479aba39d4030bf439eabdb65537ae5e8d58122fac6593a6f98f413af679830137fcd739f4e04febaa9a524ba75a9d4fff0ff0d SHA512 b27eb7d6c2dd47c55181ad11eb67a4cecb1b2f120714ae2839c7d7be3b06434c313f5f596b726c7c7a9107fa526ae700dfd20560ffc2b339eb7a6ee1fb308195
 MISC metadata.xml 359 BLAKE2B bd42be542034857259bf880395f36437fe922d69129d5d9bd42304d91a5c7d4b4abdf14172f107f65145e1d84a357df91a1863ba27769d71cf27ed3b23665441 SHA512 6c897585918895b39efa6695aeb5d21fde017b48de50232067658edaab18b90374996f2e5b10a485373ea5316e2fa7f57f0583a02478d64761e2daf2417c9633
diff --git a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2.ebuild b/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2.ebuild
deleted file mode 100644
index b86b4eaa3806..000000000000
--- a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="XML serialization for your Active Model objects and Active Record models"
-HOMEPAGE="https://github.com/rails/activemodel-serializers-xml"
-SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	=dev-ruby/activesupport-5*:*
-	=dev-ruby/activemodel-5*:*
-	=dev-ruby/builder-3*:* >=dev-ruby/builder-3.1:*
-"
-
-ruby_add_bdepend "test? (
-	=dev-ruby/activerecord-5*:*
-	dev-ruby/sqlite3
-)"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index a8f7a4be9af8..ca547bbcc69e 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,5 +1,7 @@
 DIST addressable-2.6.0.gem 104448 BLAKE2B 664365962533d31786e2a362b61879fee544867b7aadc2ceb1ae6709374015a7f0f5c0bd32a81c8f2ae711a4ce1a07cd8f84821e74c3b6aa56b7474800567737 SHA512 71aa0ce8b61a07c1d01298dcd29cb2ba73d06ed1578908cae60351214f7d0bc6c9b8b0db7a78044fb1bed258bf00f2f093aa4e2bcb32575f4db2a79ee36b2648
 DIST addressable-2.7.0.gem 104960 BLAKE2B 4bca65d54ef1d3556cf4017ae68082635c0398b6f604eb3edc18da8f8e1e49e38b46485a8716da3c407fe0605dcc9a12c7a95be49a91c4198c2e2b1cab568805 SHA512 4c438bbfa8874fdcf11eef1d1f7cceb1855ea85948daff13615a0af129d35f92cc918f4bd5bbe4cd6ebccc67a86fc582265f915dc39831ec64209de0bdeeb732
+DIST addressable-2.8.0.gem 105984 BLAKE2B 82f053c9ad052ce1ed1b6927674bd5bcda86a3f70d46b63bfc1185d51b402996fd446647d705418791c5443a1767b4ecd0b891f26de63fbe737c62f7586bd57c SHA512 c684f17940f717c2a65f9716ab9b3659948d6d51a60c38a7295fcf6fdc1c5785d2d315d2de7dab9f66a6c31f62247177d78d5d6eb556f5bb49926d4f00f8e4c8
 EBUILD addressable-2.6.0.ebuild 1343 BLAKE2B b225c1f2f7a58272e83b7a6be35aeb220a2f5cc1f94185259179f3ed89356eefc90ec03ba65631c4c676981d841a6f8b7b9782de203b3876a6451f6fb1baf165 SHA512 2305bb1ad32f470d303ab3b702ebb6bcf2056233c997be75be3c802d653e8386bc29d5ff8666dfe477edacb0a2b62bf5a9b3bb0ba44c55e208459197bd6a44b3
 EBUILD addressable-2.7.0.ebuild 1310 BLAKE2B 9a404fd941bf78f539164435864da9dcababa6a7188eebb182b2c23511cda0b849ef10937d7fc5728c9cf853a50c588548936f87b359e44d98accaa22a238ab3 SHA512 65256c662589db08c03be5db84c6805a11a685eeb4d47c5f1fdff2651b63ab980b891714d2da11000f2a3b0849049768462c6bd67b15f5f9093ec026dd61e2c3
+EBUILD addressable-2.8.0.ebuild 1310 BLAKE2B 9a404fd941bf78f539164435864da9dcababa6a7188eebb182b2c23511cda0b849ef10937d7fc5728c9cf853a50c588548936f87b359e44d98accaa22a238ab3 SHA512 65256c662589db08c03be5db84c6805a11a685eeb4d47c5f1fdff2651b63ab980b891714d2da11000f2a3b0849049768462c6bd67b15f5f9093ec026dd61e2c3
 MISC metadata.xml 404 BLAKE2B 4362f3592286dd6cffae99340e1b4437af10ab4dbbe44585d3370b0970e7d02a881853329c9412bfc881c3f040995a204b758aead2c34cba4f9df8104f858479 SHA512 c335566562492b85e491233d4f908fe18c2713ed9ac3afe2cb4d9537d71bdfa1a10bf58f1ca9f29e5a695fde9a4ba0ff9b3c57122afe78907cc0b00b5c307351
diff --git a/dev-ruby/addressable/addressable-2.8.0.ebuild b/dev-ruby/addressable/addressable-2.8.0.ebuild
new file mode 100644
index 000000000000..444a23a8b9eb
--- /dev/null
+++ b/dev-ruby/addressable/addressable-2.8.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
+HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
+
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "|| ( dev-ruby/public_suffix:4 dev-ruby/public_suffix:3 )"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	# Remove spec-related tasks so that we don't need to require rspec
+	# just to build the documentation, bug 383611.
+	sed -i -e '/spectask/d' Rakefile || die
+	rm -f tasks/rspec.rake || die
+	sed -i -e '/bundler/ s:^:#:' \
+		-e '/^begin/,/^end/ s:^:#:' \
+		spec/spec_helper.rb || die
+
+	# Remove specs requiring network connectivity
+	rm -f spec/addressable/net_http_compat_spec.rb || die
+
+	# Remove spec that tests against an unreleased github fork
+	rm -f spec/addressable/rack_mount_compat_spec.rb || die
+}
diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index e6b210c0cf0a..99fab60f1a20 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1,5 +1,3 @@
-DIST airbrussh-1.3.4.tar.gz 1449949 BLAKE2B 26b7a408e5453554ff422d4da2f53a3fddc6f68ab652673445db24fa53ef52f0b8293d1701406a63d6b6323e5219c9cbc9880879e58e394b2a912b9a1dc22cce SHA512 8fbca27a115b5bc5e87ffaf3a0e91aabdf3e64b22b7192b5e6a38efe862a7ad6720447241eb85dc20a459f07054c298e8f71fcd80a1d461375a4136fab4db409
 DIST airbrussh-1.4.0.tar.gz 1450070 BLAKE2B 94f128cd25c5af48f17fa771c366d3cdf744dc4e7ccef23de583b1ed60ffe1640dd7d02d76fb78573936beb3412c277151b36a870ac3e11222c3135f34b0e140 SHA512 e3a5cb80365a963875e89d15fa2b4dc86985d6b5f13ecfa9baf9ad599b5780ef8ea2c2e4040bb35498a5ecd1c6becb081b3e917cfe082d2db63fd74ba54755b7
-EBUILD airbrussh-1.3.4.ebuild 865 BLAKE2B 8affb973ef0539e6e626f65d6e4d1774ef880a913f53eceb86234eb5dfa654a50e211ba27fe599252b38c05d1bcc11ad49f9db4137684c97258c947b998bcb38 SHA512 f6359208830ad4b5baa9dd7d0f975a98089b7b5f9591d539ae2e684a55f6ccc44efda2991041540b48d6d44556fec10f3070b7edccdebff482a43530d99267a1
 EBUILD airbrussh-1.4.0.ebuild 889 BLAKE2B a2b6121b61bfd7a21e2c1942be0ed9cae00c8ff2a62ead036a7a00c7125ebfe46855ecefb9fd278b57b13e603d3a505e93fab81481b9d394e1d5fe95b11c195a SHA512 2a6280d45b3d9684d0bdc9369895bc7bb024a2c54e8cafc5aa9bae566276a64854f91960f18daa2043d4124afc7930af893c3b17c3c7d89f888e504fda9dca20
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/airbrussh/airbrussh-1.3.4.ebuild b/dev-ruby/airbrussh/airbrussh-1.3.4.ebuild
deleted file mode 100644
index 016e1251a0ff..000000000000
--- a/dev-ruby/airbrussh/airbrussh-1.3.4.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_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement log formatter for SSHKit"
-HOMEPAGE="https://github.com/mattbrictson/airbrussh"
-SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	rm -f test/support/minitest_reporters.rb || die
-
-	# Avoid a test poluting the environment
-	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
-}
diff --git a/dev-ruby/ammeter/Manifest b/dev-ruby/ammeter/Manifest
index fcb5b581f431..8ab52bef4c20 100644
--- a/dev-ruby/ammeter/Manifest
+++ b/dev-ruby/ammeter/Manifest
@@ -1,5 +1,3 @@
-DIST ammeter-1.1.4.gem 19968 BLAKE2B dbc773e4db83d820e5ef1c6ae3af2e65f87ff1a10a09759c66a4dad87cd175e5e8af857435b6df6cb93167869d31fb1f43dcf220e063db03d048aa8926c7daaf SHA512 57d24c67be85fe34ded8feda045771974be7cdd828780a82ff0b2f6b52d0b35b48c2eb7e59dae70700fba676242918ef6463448090d7729d49db0f05f04b0131
 DIST ammeter-1.1.5.gem 19968 BLAKE2B e4a7af65c8ee798b24f0c8a312315461779f5e1c31d97da1663d73b1a9cc65b99ed9f693259eed01a4152ab220d34ddb91ee4632657035fc1768897fae60d60e SHA512 35758fccaa51c9873747f24710168bdc0a0b25bd825d15e434cd17341d07f73a5078293d5045dcf88061765e92fe08f9b2470b4f206d859e82ec7befe64c1d93
-EBUILD ammeter-1.1.4-r1.ebuild 1603 BLAKE2B ff60de580e6934d7f0d2a8b3c233e19667c174c769e9bb6b0bb78431f91fbe9520a3d39cbf44be1b05bc2d2388602185c457085ce08af747c5bc6b066d76e03a SHA512 7c205c8fd66eaa67a39595c877a866814c6f9d3b77e312dac918c78685ced25b029ca5bbf6eb0928c75cfd3ebd1e185028d6f3b76c54415a9a535642d4481d78
-EBUILD ammeter-1.1.5.ebuild 1589 BLAKE2B f6a7690d853908ab94ed9964af20649b992045bcb0aa4df697631f3f21ae816b9c4c78f6252b2a7115ace9b625af013d39eb1f9a70d5a6487de5c5556f7b795e SHA512 6b98780c315a37592fe87dab6c31aab0dcf10f8f01f811763d47283edada178dc2cea3a5ea0e3393e5b95802b8dbf46c88a2c6ea30e79cb6c27d57f44c2ad949
+EBUILD ammeter-1.1.5.ebuild 1596 BLAKE2B a5d10bb1d046c256e95ecfea62bfc5c63427ab96a34d7c7ffcba2de1d04b10a922c2c68c41b65620a37261c41b087d993dc261e8111d12cf60205d44e63262bb SHA512 09d31e8e8dfcc53e3f866b7a6bafd359b5a21cc118bb4e6c1b142d210109cee3b1306a7d7665b8995237fd13901c7f5cc71bf7cfc91a910bdc9f9e4d73a3a10a
 MISC metadata.xml 348 BLAKE2B 1eae86b63a0e04b8b5e8d8d9438b102b029a919af6fdb0cf2319b11a3c50ee282a255dedd7bad0bc3098ea8d1c0c05e17a5d98b382fa454feebbd304b18d3f57 SHA512 f81eb53098c1d67a4d5cfe32c9b3aace294cb90788775c639e189cf3932ef8101466d9a1541ceada391ebdacfedf926d9549f4591b42efd6c391e5fe6b0e72f1
diff --git a/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild b/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
deleted file mode 100644
index 19a06c834754..000000000000
--- a/dev-ruby/ammeter/ammeter-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Write specs for your Rails 3+ generators"
-HOMEPAGE="https://github.com/alexrothenberg/ammeter"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-# Restrict tests since they now require the specific rspec version to be
-# provided in an environment variable.
-#RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/railties-3.0:*
-	>=dev-ruby/rspec-rails-2.2:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rails-4.0
-		>=dev-ruby/uglifier-1.3
-		>=dev-ruby/rake-0.10
-		>=dev-ruby/coffee-rails-4.0
-		>=dev-ruby/sass-rails-4.0
-		>=dev-ruby/jquery-rails-3.0
-		dev-util/cucumber
-		dev-util/aruba
-		dev-ruby/sqlite3
-		dev-ruby/bundler
-	)"
-
-all_ruby_prepare() {
-	# fix the gemspec; we remove the version dependencies from there, as
-	# it requires _older_ versions of its dependencies.. it doesn't
-	# really seem to be the case though. Also remove the references to
-	# git ls-files to avoid calling it.
-	sed -i \
-		-e '/git ls-files/d' \
-		-e '/\(cucumber\|aruba\)/s:,.*$::' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# haml-rails is not packaged
-	sed -i -e '/haml-rails/d' ${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
-	rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || die
-}
diff --git a/dev-ruby/ammeter/ammeter-1.1.5.ebuild b/dev-ruby/ammeter/ammeter-1.1.5.ebuild
index 00f45c94f10f..4e27c1aab425 100644
--- a/dev-ruby/ammeter/ammeter-1.1.5.ebuild
+++ b/dev-ruby/ammeter/ammeter-1.1.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index 135b6fc930af..50d7e8354951 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,5 +1,3 @@
-DIST asciidoctor-diagram-1.5.19.tar.gz 11707367 BLAKE2B 2088d2a7b424b9a716204e607d6e4c3bb7521b2098caad131210c163ade6f8a07872793945829d6b1e6e88a9d04126738eb439c968e99f326baddc310b48de0e SHA512 14270c8ea0e63163e01171695ecb99f5ef9667e2ec50b26e56495a1fc2c0e8af97fc784f5decb8fc75f1830581a9bc658d699af6aeee52adc20adad82cb1aed9
 DIST asciidoctor-diagram-2.0.5.tar.gz 12482984 BLAKE2B b0ef8596d2f2dfcf11fcbba876141aee38e8615195159f76e07b45c00b46bd85824dd6e8e9f571b396bbd9d082c5d60d4e05cdeac27719bfca53216c0d1b1816 SHA512 7e3bfbfb08d7389a039b1727bc173fca82e05134bebd89f3ca65d5e7860555034ff5e785c32e55ea2cc9826343456c6ecdfa15fc76f4d94858461356ab3ced71
-EBUILD asciidoctor-diagram-1.5.19.ebuild 961 BLAKE2B a150cfaf63fd872b605a7abd71d00d8acd6cdbe8b82b93bc35c38b6f12aabaec2c87f77e7ed2a9be06211e53cee4d653b8aa6d9f4c9ae6691daa958280c12d05 SHA512 0595efddc4c05fcea79b51e68cb496b1a6938f334d128b0c63e9ce8631e0be9c856d1b401800093aa25aa44188942e4f3ce41a57f99ad6b6b0e0e12afec9a23a
-EBUILD asciidoctor-diagram-2.0.5.ebuild 993 BLAKE2B 58d7b55ff1cea292bd569a6c785771f562f112d37ca4416266e3ce7709f1cddf8facbaf2173eb7b6b46723f0c0fc0471ebb5bfd5910a1c0702ddaa768a33ed02 SHA512 294339607556f38298a2319b55c74cd8e6ff4ac7bf5568809de92d3988c864be943d5f2fa54e24259317d296cea217e7a7ad91fc9651d6c97bcd40c6661d4052
+EBUILD asciidoctor-diagram-2.0.5.ebuild 1000 BLAKE2B b6acfc52ca81cdf236bbcc6b7712e62ef9e82381f9d05f81cbb26a860c435eb477f8b14cc291939aec9c13ffc197591a45d2a67e8561ec70c2d4307b3c71fb26 SHA512 987dd89d93cd91f3eeae8082490971fb3797a4d3c17628c76952fb85ce2df2b43ba51bd0b7b49bf1661c5f051f731b420dde3bef0f5f62aa8cf98a28ab7ad972
 MISC metadata.xml 357 BLAKE2B 967e1f1518c38ff81d15df5b62943b278acf74a80938d488cca0d2489f268ba0d41ad74e78b7b53bc1fd4ed646880ed36defc9c110d5af3535970c364d8c923b SHA512 711af8ceb9724236076e02a077672296a835981c7a78e4f5f5976dc190b2df640d24933cc2d92e81f84e695f473d187a7e83d2b60c3573a675ba30b01be85db8
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.19.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.19.ebuild
deleted file mode 100644
index f4ffcd99e925..000000000000
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.19.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
-HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
-SRC_URI="https://github.com/asciidoctor/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.7 <dev-ruby/asciidoctor-3"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/c.formatter/ s:^:#:' spec/test_helper.rb || die
-
-	# Avoid specs for unpackaged tools
-	rm -f spec/{a2s,blockdiag,erd,mermaid,msc,nomnoml,shaape,smcat,svgbob,syntrax,umlet,vega,wavedrom}_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-}
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild
index 9a6dfb6b1969..48579c8ab99e 100644
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index d6e85b0d3b89..dc5cc2a5ca2d 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,11 +1,5 @@
 DIST backports-3.15.0.gem 152064 BLAKE2B a2c2a1f35ab6f682be23a5189bafec563a2d028ed5f0e0a4880ad85e09ac7af1085a601323ec3459c5be87a5271c6c3e47b6e80005c50e3084d4ac1dc9f2fd35 SHA512 4eb1f928c37596971fa274d838ab991bce462a7f571cb68501fc81e579693528e93536c25e4b64d93f4f0edfd313c8aacd8af014bb5c586cc182867e78f614d5
-DIST backports-3.17.2.tar.gz 158235 BLAKE2B bc761ee147adec209f2dcc3ff95e8ba82b8388c58b3b6aeb11c4f294ebf8aed74ca8bea54833df5adf32b2fd65ec01b621d2e8422d344fe9e1fa228542cb6118 SHA512 2194dd0e89c111f02d161ebc60827fb0276ad32c9e611156687a0f83604db2b25bdec626d7671a7a6fd7ce1395dc818a3735e63a2c165f41a0dd37ff37487d4e
-DIST backports-3.18.2.tar.gz 158492 BLAKE2B 7ad924758939fe50b26fb845e96583a57a06e0039780eb96c8df9c535bd5aace261a6b3619ca3bc3a772c0db51162e9d340a6a1515c746acde91d8cb608f83be SHA512 3293430331f217c13f754242848f2541906ce930a8683f0ed65a64f93dc1d2387ef33501b1d8129872d536bf2f59c4e975c67abc2cd966277fd62ffbc68b5522
-DIST backports-3.20.1.tar.gz 178390 BLAKE2B a21ba2035e83ab309582a9ad6b01006079ab38d0990724942ffb591e2ed536dbb6f176c940ccc019bd374c38ca9a0ebd271e32563a41a71e06d1c631084e0445 SHA512 4330c1c8928d914fe85dc5d3797ab0b02b37e5ed3fed1899d6368504dc64c2241fc87357bc5155e708902ae93bf2160276d60a6b1ed5a23fbb234e2598a1b441
 DIST backports-3.20.2.tar.gz 178633 BLAKE2B 2e2f2f31099763bb218f3ada9f9d040d4b41fc842bbc8b91d703e91b89bab9d6e7bbf3aae1ecfe34abe6099d6cb34929ae72ba66d4ee473841563257fa85cf3c SHA512 a91a2c9186315fca8e0b33554ef26986abe8565e08a79b9f150f8115f998b2a7a440bbc64b92f89c4e95e1c5e852bfeea6ab337804cf017517e77229f10820e5
 EBUILD backports-3.15.0.ebuild 667 BLAKE2B f38afb21d4795a224fcc909db22086980b3d2a135dd7652bcb03839e34a485a183614d2e42628d18cc1368254ade263d43a26e68dd9ca3d120f1e130bca05d1f SHA512 26542cdf65e3141ad22773e0fd6f7413a8f7e066c8c434c20b626066f0cd69fa8608ad8f49a9ffb0d3289a87a438de475f39a64c5fcc4ccf6ba8d59ace3bf531
-EBUILD backports-3.17.2-r1.ebuild 799 BLAKE2B 9425cb27ede8e0080fa42382a1fd544368bffb78e07562235257eabead40ba2bce22010695007eb3292034c59b447fece7ed26a72033e41108df1193421f1bb6 SHA512 4a3a769a52ef82ea095383fd7bd30df8d95cb7dc23bd35fd6ad67d2bcb4591137524c02d23eeadf8e434284bd8488815b3a84f9c5f3691e4868e5eef3fc05dde
-EBUILD backports-3.18.2-r1.ebuild 792 BLAKE2B e4ef3c9534300ca8baa1a66ebfad865f5c923973f374aa7cf1c52dfd2ad2c35346f5e63c2833f056d45068742804d1a4f189dd755604f837644615ab15f5dbd0 SHA512 6e9556c4fabe5fc87a13079465a2ce2cac1b18644b234066f27d5a70422720f3869ec4b7ce4a4e5063d964554c95f8758fe618a07ac9550381fada6654356504
-EBUILD backports-3.20.1-r1.ebuild 799 BLAKE2B c1f35d8297fdd3711add94e7b452fa5a2790b636bf502bb837585f0831aea921f8f1142af6e77a77b59a402c866d97504322d6203700a7354e1a238f669fad45 SHA512 d0acc8664d774310733f3ab34df1029ae1b50529d4f3446e0981cd872b9a8040b0057c09a3e86506474a101aa953cc1efc012cc35dcd6301229d2c31ef409a8b
 EBUILD backports-3.20.2-r1.ebuild 799 BLAKE2B c1f35d8297fdd3711add94e7b452fa5a2790b636bf502bb837585f0831aea921f8f1142af6e77a77b59a402c866d97504322d6203700a7354e1a238f669fad45 SHA512 d0acc8664d774310733f3ab34df1029ae1b50529d4f3446e0981cd872b9a8040b0057c09a3e86506474a101aa953cc1efc012cc35dcd6301229d2c31ef409a8b
 MISC metadata.xml 335 BLAKE2B 23e6e33c417bb055592549fdd07fd02a2d97b613095e42248f501ee6ea71e3d4b2a2e25796060d3448900ba0d2fe66d0c44307be97b89834711ed153751126c3 SHA512 2850da756cf7d97e70667e06587ab9a37869e4a77417c12386edff4ab09d380641a4573a7ecaa6eec5809fe85106ca53844b4b25fbeb6cef8e451fef2803ae19
diff --git a/dev-ruby/backports/backports-3.17.2-r1.ebuild b/dev-ruby/backports/backports-3.17.2-r1.ebuild
deleted file mode 100644
index 08e5c9e9e838..000000000000
--- a/dev-ruby/backports/backports-3.17.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/backports/backports-3.18.2-r1.ebuild b/dev-ruby/backports/backports-3.18.2-r1.ebuild
deleted file mode 100644
index ac1167a57b55..000000000000
--- a/dev-ruby/backports/backports-3.18.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/backports/backports-3.20.1-r1.ebuild b/dev-ruby/backports/backports-3.20.1-r1.ebuild
deleted file mode 100644
index 75a2971adf29..000000000000
--- a/dev-ruby/backports/backports-3.20.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/bcrypt_pbkdf/Manifest b/dev-ruby/bcrypt_pbkdf/Manifest
index de675f6bdad1..faceee6595f0 100644
--- a/dev-ruby/bcrypt_pbkdf/Manifest
+++ b/dev-ruby/bcrypt_pbkdf/Manifest
@@ -1,8 +1,5 @@
 DIST bcrypt_pbkdf-1.0.0.gem 24576 BLAKE2B 0d5b1d90d57dbae986fcbb92cabb0ea598d6b928dc97026e8d2078f41898e0c143544a004a561c0a392504baa4b845a27f9c1e19c369f6342f7ace9de7f04d3f SHA512 b582407617633f5277cde9251ed1fd2ca408ae8bd19cc73f107d7932bed38061dc0099d3033ff5def1b586507392c33d8c50815fb156322f0dd08fbbe4a8e967
-DIST bcrypt_pbkdf-1.0.1.gem 24576 BLAKE2B 7ccade2b5eeabcdcffe5c53bf8ed2e4163536229b7ccd356e173c0b2a27c720aa5429ea0081d2a3e7e7cfc52613c32a48529233156b56db4bbd48da61bbd9cdf SHA512 7caf65dc48ec9d51dbde7741b0960e2606129f888787db31fe36f3cf103d51f06156e942badb10310faa8ca9dcf8f7f8dd86358431942a6e2097714ae3462dee
 DIST bcrypt_pbkdf-1.1.0.gem 24576 BLAKE2B 4fb9449c23c1a1caefbe7acae630eff9c6ee22b77d1eaed6475400ab2b37186d3f15b867cdad364daaaf27d6b817d6a2a49cfbf567a889264fdd64903f06cf89 SHA512 a7b9f123274a2f93e183be7339149b1df3b185331fdc63af58e342ae4bb734fdcf709214a50922218b837481349948e10ec879f9b8e1a6928b1b7b5617f83be5
 EBUILD bcrypt_pbkdf-1.0.0.ebuild 1091 BLAKE2B 87453b2647c98479ff54e8fc45ed48ae875682134feb4751bc6094d39a452d539e7a1d176818523392d174c00502b559ef625e2a740bba06b841ef55f2c54da7 SHA512 0cdf6de34b390231c2933b2257577c69a18fde6511b8e73ad9e114abda76d596ab6959d018a63829f5944a576291f9907058a5ff4bf51b2fa930438cc9e6dbc4
-EBUILD bcrypt_pbkdf-1.0.1.ebuild 1126 BLAKE2B 1de9596c2f022351f904f89d04a42f6aff409e115360dc8cb7c1890ecf67536d37ca5665de6fc1f89e6020b7f6f8f54da5f3b515f029277a289aa519d47af379 SHA512 b5be2902e3fd7f47e1dc40ef0220e1ecd2c4910d411ecd1e28c318ccfe14f4d95da6248b81a48b68b5ebd942773e71838d885f0045be671b26a8df65796e38d0
 EBUILD bcrypt_pbkdf-1.1.0-r1.ebuild 1110 BLAKE2B c686e78906f7187b109b8937e498607dc16fb3e364d0f15b1e35280f7e0d0bcade08c2f39bf0aab69133caee061ac72d5ca8df19566caf0985db62406ac5cd6b SHA512 e333371574905c879a9bbebd3607a7cd3405232bd48ed3d7c76c14944f17cb518f1f7e58fc6c2909340665256d72a86f73521f5a1ffc3023e520fcc53050aa67
-EBUILD bcrypt_pbkdf-1.1.0.ebuild 1095 BLAKE2B 760d16c8ae96e77ec9e1ce10e6920c17d5e7ecb9ab48a880bc1196ced94c6c14d743437da08596ec04b7311116aea09eed80ecc622c4bd39df6c2f79656391dd SHA512 0b4eee7403c01d0ef287906c3373730bcdd2b7a7c7a1920ee5a7c799f151c5d2e3db5aab8d948b1f32825d188900bbb2b4317ba34fa3c95ce445ba3fd4c3433e
 MISC metadata.xml 351 BLAKE2B c94f203ff5c3e7f1b17922c986b5559eefafba479f71868c675bff11099cba93a4d1102f65f5bdff1d1f8cf6ec58d43dfdea33bf9b1301dd22deded3b8e1c758 SHA512 03184605cef97c6fe2390bbf0b4d33d83faf6c05798bea8af352b96f844be84cec02f1845a77f841cc06645ae791cf5c16beeaa1da4967de6ba0c8e1caab04fe
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.1.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.1.ebuild
deleted file mode 100644
index 25f0fe94d727..000000000000
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)"
-HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( virtual/ruby-ssl )"
-
-all_ruby_prepare() {
-	# Don't use a ruby-bundled version of libsodium
-	sed -i -e '/rbnacl\/libsodium/ s:^:#:' test/bcrypt_pnkdf/engine_test.rb || die
-
-	# Avoid unneeded rake-compiler dependency
-	sed -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' \
-		-e '/bundler/ s:^:#:' \
-		-i Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/mri extconf.rb || die
-
-	# Some methods may not be inlined on x86 but they are not defined either, bug 629164
-	sed -i -e 's:-Wl,--no-undefined::' ext/mri/Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mri
-	cp ext/mri/bcrypt_pbkdf_ext.so lib/ || die
-}
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0.ebuild
deleted file mode 100644
index 20942ab3e80c..000000000000
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)"
-HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( virtual/ruby-ssl )"
-
-all_ruby_prepare() {
-	# Don't use a ruby-bundled version of libsodium
-	sed -i -e '/rbnacl\/libsodium/ s:^:#:' test/bcrypt_pnkdf/engine_test.rb || die
-
-	# Avoid unneeded rake-compiler dependency
-	sed -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' \
-		-e '/bundler/ s:^:#:' \
-		-i Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/mri extconf.rb || die
-
-	# Some methods may not be inlined on x86 but they are not defined either, bug 629164
-	sed -i -e 's:-Wl,--no-undefined::' ext/mri/Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mri
-	cp ext/mri/bcrypt_pbkdf_ext.so lib/ || die
-}
diff --git a/dev-ruby/bsearch/Manifest b/dev-ruby/bsearch/Manifest
index 367130fd2d87..3a05f8607656 100644
--- a/dev-ruby/bsearch/Manifest
+++ b/dev-ruby/bsearch/Manifest
@@ -1,4 +1,4 @@
 DIST bsearch-1.5.0.gem 27648 BLAKE2B 6b57cfbdfbb56df9c1c8374fccc59746241a7571aa7328519ef2f5c85e13e0cf8f54c90cb55deef2b08a902c9123c63d0b299ca7026ccde9b02aad02d4411181 SHA512 6246921be42e15ac35cf862833e156a01a0de9e0d2bff53af8eaadb3e7a512b7ab1e9dbef5b05282b82b26e589e45ecb6e31567b382dfc6eb62757e658cdc660
 EBUILD bsearch-1.5.0-r2.ebuild 593 BLAKE2B 153220aac36181ea9bbe634018c7a3a87b5ae7631ec07c3e1852fac6312a6f5dd2627d57ab1fb1b5cf9eb06dfb217054b096a35f7c10ce82e2da8c945fe9072a SHA512 bdfcf60163f64c4776b2473c57c291384d958fe9572f8470f7461c8487ddabf87f0bb459698c99601bfd55cac76eb987584c7d6f64f6adc45ed55625652a873b
-EBUILD bsearch-1.5.0-r3.ebuild 596 BLAKE2B 594fdde96a76fe4ea8d048e693a5ca44c5b3b15c39eb8ece7d15bfa5e10534e3323a1292996cfebd02aacb1c0f03a25dd5f6d6394e4f36beb70b80251f6f5187 SHA512 295a2f8291e362aae0aa0096f1127d329ae6087bec941427f9e7cffe157788408cf70717d78cfbf7670676cc25f76815aa8fda79b0015bc510ba1b3a1a32ecb6
+EBUILD bsearch-1.5.0-r3.ebuild 599 BLAKE2B f89844c7669ac8f2f957cafe8b4cb706cd22251d843f7ab539073137538fe9fb2766ccf13fcfd141768c7345c3b1dfbfc84a8b7251c740084ef7a0c26ddcb751 SHA512 c87e221c2771c48189b3c45491611ecc3d1741530e6caeb71b2f2ab088e3e969704c190d5cbef6ebd3cd0c7db76c221891d1de60d2cc7b3a953e2c3f57b6378c
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild
index 0badfb68ce5b..92e57b79b1bf 100644
--- a/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild
+++ b/dev-ruby/bsearch/bsearch-1.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="doc/*"
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 inherit ruby-fakegem
 DESCRIPTION="A binary search library for Ruby"
@@ -14,7 +14,7 @@ HOMEPAGE="http://0xcc.net/ruby-bsearch/"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 7cff055ea948..a5d0187bf8c7 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,14 +1,9 @@
 AUX capistrano-2.15.5-sudo-cleanup.patch 656 BLAKE2B 06c0d83cf2b20337d7692ca3286a6ab8fb3797d67d81ee3498a5cd49f37d94458d19afda1eebc4904c5209809ab869087cd6568af1a4c89aba1b2a2826226fb5 SHA512 846f9c25b1c7806d082ec73faa2b5b9d4b6be285a33acf1d98dc36b9eddab54d664d915c3bab1da28fa2d86225fb1619fd746354cd605b8e3e8a5d0a05cfb96f
 DIST capistrano-2.15.5.gem 132096 BLAKE2B bbaa6bd482cf9bbe7aa01540aa5dab3f32401ffa1476d9057bb8ad420194f1ab2c32d8e744d7c982ebece5c4b5369133dc8378b7adf54c78732f9cb249db2a9e SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff
 DIST capistrano-3.13.0.gem 69120 BLAKE2B 394f60d9a3acfef44eacef356908d10d5c7f64010d644fbae988e399b1b8cdd07c1d93b4a6a4894816dc94bcf61180a2bd5f4663b1f014a64ae07ffb82252a90 SHA512 fe7cba9ecfe54d9f8c557dd4e1f8b1ed1269c7aa1e8c687d55fb035b3666ff92ee93895610f0582d139dec56a78c84754208e2aa99d6fc3f4f46c3d45142e2d9
-DIST capistrano-3.14.0.gem 69120 BLAKE2B e9c503a43cdb5f943c84882cc728cf4004afae194a94de763872c8f20eec80a9b6fc05c723cbab0e5ee41d87cfca8947ea62a28ca1d32e6bd2b86f52d1ea859c SHA512 5f117a6efec1a35a188f1ea57f1738bc41bdf3614b77a61ca2e941480d36d74e392400543948a55c054871beb88563489115bb69fb34bfb9f0c32a371966cd42
-DIST capistrano-3.14.1.gem 69120 BLAKE2B 33e351a98aea540a5903f68be6fbdde8c104be5ca66de707963f0a3b5c3460a086b5656fbc1cf98e37bed1507fb98856821a0633c2b86694112f5d357dfe8186 SHA512 10071c5b2ccadfd41ca321f21731dca8bafcc8efbcbdaf8099c562188d1cf802bc8c3845644c3ba301e4d9954fd8ab2c9022ee734f580a8be55b6dd8918cf11b
-DIST capistrano-3.15.0.gem 69120 BLAKE2B 07887b773b9ec3570d9103a35880fe84b1205ce7a53b15584c98b0ea38e236816d68ccae261e35e4d79b09f7f6fe48d1f4fa9b2daf41350cb119345c7ff597c0 SHA512 087825839239f66f004c2c079a3b1d3553465c2ca4da8bc67e737fcfadf22b618ff70542ba5c255cc47e2047245aa5b57148432a68afcf48dedbe96e0257931c
 DIST capistrano-3.16.0.gem 69120 BLAKE2B 3e1c4f639c2d5cd36ae305746f53e68350d5eee39fbd5c5ec828ea5b69f47a3a5f8b4e6f4b65de2e24717f71cf4a9443879fc3d076474ab020e2023372085180 SHA512 ec5aa465065cd115f0a1b7db06b7c68f2034e81feb3b814b730a6aca464756e545fd5c065ea941a3076bb637448e2a0f04aeb56de2578cdf22a6f208d27a2219
 EBUILD capistrano-2.15.5-r2.ebuild 1233 BLAKE2B 224bd9e8f1429a7857c2d00fcd49ce5c4a5938926f718e676687437b15990d2437752f974e3967ad3562d4f49b2da1c57cdc44f60eeaa453f956478e3971edcc SHA512 5c8278e6fa7ccd6fdc8db10478396b6dc00aac73f36d37229d3773a5df43c4b79982390bc44aa7ac0ad7f32280d41f00c2c4b0cc5a045c393ee37062fc9c51cd
+EBUILD capistrano-2.15.5-r3.ebuild 1243 BLAKE2B 3fdd7e2c2b26a39b2f590b82fa5018d2d95276892fe8a7479d790ec5beaf27c864bb4e4e627059bcdb51c8b184dbec15edd0bfb9570d6f56f4cbd04b22913ab5 SHA512 260ad225666f8229de86fc34f3b69414e9235fd44c80933feaafa4ac5dc1f85e3c7eff574c6a0246b2ab525c79b6ad4c0475588373060bbe30897472d59a616e
 EBUILD capistrano-3.13.0.ebuild 925 BLAKE2B 4646005c51f55dacc6142c68f5fa35c6a9b35fd5cacb4f10f5c7d1bf662f2a005d53caa97d7c2d859145f5c0d79ca1a6c2e3d043edecc8a59dfc0a100be07112 SHA512 e5a5475335242113c096e4945ba74b9667d84ce0146f605aca880d4317b770fa1f2ea4773aeb22504cd7be9cdb394f9dacd056f6ed477980d9a9e575acc8561d
-EBUILD capistrano-3.14.0.ebuild 926 BLAKE2B a4d7e28359be35573c458107ba17d05e6470f367dc1c71bcdb5809be0e128ceb6129775850353cb8f7ee0a22d992c9158fa6888aa7a474113e7c58f5e12f6e30 SHA512 4d64494fe679729de181bd24d508f9689a3479e18d726960e87599ccdc4b8b8a89cef120aeea24ed9dbfe3fb1e37fb628a78a614d7ef48045e84fd8cabea8360
-EBUILD capistrano-3.14.1.ebuild 926 BLAKE2B 221720b5ff0b5e60d376cebb57cc5ed8b52f1fa0e1745e32e79160d1d848e8ff0a94ea61cf75e58426e48b5dd45a72eec1e99f733bc8a8bec50ba7ae92c93bf5 SHA512 e510204b30df795c1954d1b645d5f6b7b7708f72af2868659d4ca33b7053240ddcb63c2de163000223ff13f2582b1ef2c65b25d10198c0aa26df8dd919b83e88
-EBUILD capistrano-3.15.0.ebuild 926 BLAKE2B 45f336d61b7a2273384f424ec80b1d299c7d217a2d0aa6397da9300ae952b46cd23783e2784e60a537b669af4c89524ea9b69d59fbf8928a0c954acd863cf3d9 SHA512 e9dff6c2b92578982aad9588b870234fccdd7b51c53aafbfbb8ea3e52b7c5b1c584558cd6a9a19eb992e37c162bc5bca6a6cd54e97caf67d6045d9339f937720
-EBUILD capistrano-3.16.0.ebuild 926 BLAKE2B 45f336d61b7a2273384f424ec80b1d299c7d217a2d0aa6397da9300ae952b46cd23783e2784e60a537b669af4c89524ea9b69d59fbf8928a0c954acd863cf3d9 SHA512 e9dff6c2b92578982aad9588b870234fccdd7b51c53aafbfbb8ea3e52b7c5b1c584558cd6a9a19eb992e37c162bc5bca6a6cd54e97caf67d6045d9339f937720
+EBUILD capistrano-3.16.0.ebuild 925 BLAKE2B bc050c047edfae2e35d848149c247626aab342d588798355d85ec1cb17b60aaa0fc015468a0ad0c1d8264db412e6c963592aabbdef393ff5e0e218efd9e614a2 SHA512 3ec663167b9bab9dfef3cf44ffe55b3ee210d1e8f4bbbfef339211016993183167af5c13b5af13ef3fb987c7b735a629c358d8249f4ae4d4ba6a9070d0fb6215
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild b/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
new file mode 100644
index 000000000000..6beebd2f0210
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-2.15.5-r3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/net-ssh-2.0.14:*
+	>=dev-ruby/net-sftp-2.0.2
+	>=dev-ruby/net-scp-1.0.2
+	>=dev-ruby/net-ssh-gateway-1.1.0:*
+	>=dev-ruby/highline-1.2.7"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha:0.14 )"
+
+PATCHES=( "${FILESDIR}/${P}-sudo-cleanup.patch" )
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile test/utils.rb || die
+	sed -i -e '/pry/ s:^:#:' -e '4igem "mocha", "~>0.14.0"' test/utils.rb || die
+
+	# Avoid copy strategy tests since these fail in some cases due to
+	# complicated (aka unknown) interactions with other parts of the
+	# test suite.
+	rm test/deploy/strategy/copy_test.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper cap /usr/bin/cap-2 'gem "capistrano", "~>2.0"'
+}
diff --git a/dev-ruby/capistrano/capistrano-3.14.0.ebuild b/dev-ruby/capistrano/capistrano-3.14.0.ebuild
deleted file mode 100644
index 8fbec0f004ec..000000000000
--- a/dev-ruby/capistrano/capistrano-3.14.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_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/capistrano/capistrano-3.14.1.ebuild b/dev-ruby/capistrano/capistrano-3.14.1.ebuild
deleted file mode 100644
index d927d910300a..000000000000
--- a/dev-ruby/capistrano/capistrano-3.14.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-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/capistrano/capistrano-3.15.0.ebuild b/dev-ruby/capistrano/capistrano-3.15.0.ebuild
deleted file mode 100644
index 5972f35d3692..000000000000
--- a/dev-ruby/capistrano/capistrano-3.15.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="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/capistrano/capistrano-3.16.0.ebuild b/dev-ruby/capistrano/capistrano-3.16.0.ebuild
index 5972f35d3692..c6f673eacd24 100644
--- a/dev-ruby/capistrano/capistrano-3.16.0.ebuild
+++ b/dev-ruby/capistrano/capistrano-3.16.0.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/certificate_authority/Manifest b/dev-ruby/certificate_authority/Manifest
index 913f5298048a..feb92628d58e 100644
--- a/dev-ruby/certificate_authority/Manifest
+++ b/dev-ruby/certificate_authority/Manifest
@@ -1,5 +1,3 @@
-DIST certificate_authority-0.1.6.gem 22528 BLAKE2B 85b229c7506b787b85b734883967dd8e6fc4ceece57dec2b2b8c29fffbaec2d95931af5412d61ef9935e547b68b14213e5cc6971f94ad6294476cc653684742b SHA512 d1471171aa01956ca216bdb8515e9f6fafc9720827e7351b14c7c38907e87b66a3299d9ee0322fb51b8edd1cbc4f4a73a2aa4b54ff5ca4c8bc602ced5e035a59
 DIST certificate_authority-1.0.0.tar.gz 57104 BLAKE2B e585b19b6740349e520e021d4981c3941bca9e6c9b11867c9484e98b4e74e4ebafb47c648564c3e8b89e3591414a90ee404bab83cafd5a3354354b36b3002436 SHA512 e5f05d3df86ae7e7e6ed8937667b14229cda884996c30d9a39f1ad7db781e58abb3f61c251c21174b4988adf0ecdecb1b0f22ed97ddae071ba12c78379524785
-EBUILD certificate_authority-0.1.6-r2.ebuild 769 BLAKE2B c58170c67cea3905725ae6add40477d403281c33f12c33088d5d880fe83f13797746c71edda58547bc0b0bba59fa76fdc91b0da42fb0ebf9acb21b2d6af23607 SHA512 2ce877bf95e8d45bb5770939c3a940e361e1c075e1e2bf2a1907f2c3eeed96fac4e3e51df5eb0996c7d4d404302af94c2788201363ab4768b08a42a679f33eba
-EBUILD certificate_authority-1.0.0.ebuild 980 BLAKE2B 118dd1d7833b35a6d8659fc5bb994bda11b0937d685341ae2ca1de0a1f226d294f191f8915520bfb36f95322c0af772d623c557ac386e35b4da073e2f23e47b4 SHA512 9ac00bdeac9c7209e5c98ef99e5d0c754192fb1a37d5ec77a4bcf99750e0575803833675c4c807e2480631ab72d45b9f4d3fe478b40adf0194a556718737f21c
+EBUILD certificate_authority-1.0.0.ebuild 987 BLAKE2B 7edc468007f93baf79c286438cd139c287e7819677860d2c3caf1272a25e39f6aef7eef76970cad95a6bd31ceab255a2b936e2cc3aa7fdd607f1140cae022bc0 SHA512 803f9a868d3c9eaf42ca80a13201669574b69cac707be83b741fae98c63f9a642e48245602cac64b42f51d0bebdda417c8de47871b1aa9a4af01d1b9437e70bc
 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
deleted file mode 100644
index 43c165587699..000000000000
--- a/dev-ruby/certificate_authority/certificate_authority-0.1.6-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Managing the core functions outlined in RFC-3280 for PKI"
-HOMEPAGE="https://github.com/cchandler/certificate_authority"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activemodel-3.0.6:*"
-
-all_ruby_prepare() {
-	# Avoid dependency on dev-libs/engine_pkcs11 that will be hard to
-	# make work on different arches due to hardwired load paths in
-	# specs.
-	rm -f spec/units/pkcs11_key_material_spec.rb || die
-}
diff --git a/dev-ruby/certificate_authority/certificate_authority-1.0.0.ebuild b/dev-ruby/certificate_authority/certificate_authority-1.0.0.ebuild
index 5c5666c7a163..429d6079b68c 100644
--- a/dev-ruby/certificate_authority/certificate_authority-1.0.0.ebuild
+++ b/dev-ruby/certificate_authority/certificate_authority-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/coffee-rails/Manifest b/dev-ruby/coffee-rails/Manifest
index 9983a9754cf5..a1faadfb62b4 100644
--- a/dev-ruby/coffee-rails/Manifest
+++ b/dev-ruby/coffee-rails/Manifest
@@ -1,3 +1,4 @@
 DIST coffee-rails-5.0.0.tar.gz 5892 BLAKE2B 4d3b945ab4b53936bd39599ac7ba8af4d90e6fee073188847dbb157e098f275df5a3a6e91dcf804068b707804047442efc86524935a56cf403b55426466c502c SHA512 f1aac41f8f1f7181e82fbcf8c3007f40116639e4c140f1837be835fdcfa1babc7fc370212a9954ac8398d9a8d20fbd468550cd8b11c31788428769ea7aedf769
+EBUILD coffee-rails-5.0.0-r1.ebuild 1032 BLAKE2B 092c7fe37e77b56e0393a831ec3174086712d1b8875973080cf30436b5801e95353dc446be13c4ce5049709f326e30a984c3d301732c876eb1d2f73439a4cca9 SHA512 da6755f86512573e148c46cba069b2a8bfc25545695e5cace1f3236f8a6f9d2bcef534f3a2bb70a6e5ce953b969a4f19caf03c1b398d5ae2e29a02098d143141
 EBUILD coffee-rails-5.0.0.ebuild 1019 BLAKE2B cfcc0a7673dd733f02f39ad2e05e2091e5cd18d5b54179895b89eef7579f0f194f21524f936661f84c27c525d54b3db49aa4cad2abcd63ed4a31279268599092 SHA512 9f096fd8a2756c4ab0a656daa0f1a9e7c5315b36e3e127c31dd8898301b4f1bde65ad3af5b6ee122bc67b55dcf94cad2f3d058cedeff231455ae2e8ba62806a4
 MISC metadata.xml 344 BLAKE2B 9c10d5783b118d1630cde15f1436110e2e3943f2e25b4f3dfeffbb5c12de30f0439d544e6a6fd522803cfea032b12e5d20565ab0848d8aca1972fdd1e5ceaf2c SHA512 ff265b823397054ca71fdcc18be7b1bf69396f9a7dd5b5b2a051cc0cb862ec03df4f39497043d53ee2c6af607f82f47c97c42196c09114ffb7e1c05d07b36085
diff --git a/dev-ruby/coffee-rails/coffee-rails-5.0.0-r1.ebuild b/dev-ruby/coffee-rails/coffee-rails-5.0.0-r1.ebuild
new file mode 100644
index 000000000000..3d85d5704de6
--- /dev/null
+++ b/dev-ruby/coffee-rails/coffee-rails-5.0.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Coffee Script adapter for the Rails asset pipeline"
+HOMEPAGE="https://github.com/rails/coffee-rails"
+SRC_URI="https://github.com/rails/coffee-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/coffee-script-2.2.0
+	>dev-ruby/railties-5.2:*"
+
+ruby_add_bdepend "test? ( dev-ruby/sprockets-rails dev-ruby/sprockets:3 )"
+
+all_ruby_prepare() {
+	# Avoid dependency on git and bundler.
+	sed -i -e 's/git ls-files/echo/' \
+		-e '/bundler/I s:^:#:' Rakefile || die
+
+	# Make sure a consistent rails version is loaded.
+	sed -i -e '4igem "railties" ; gem "sprockets", "<4"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/colorize/Manifest b/dev-ruby/colorize/Manifest
index 2f3fe871d337..87db9a6220c4 100644
--- a/dev-ruby/colorize/Manifest
+++ b/dev-ruby/colorize/Manifest
@@ -1,4 +1,3 @@
 DIST colorize-0.8.1.gem 15872 BLAKE2B fe8e3a3e010d55954fb9e3e26626202e1d3eba5478e27009fc86bd4029c98fe5a2ed2f2b0d5d1615e892435554272a70c1cbfcdadadea8bcaab894cb290e7992 SHA512 0819dfaa94150c85cbe633c77006f2f4bdd6c4f9bf9dfa954b8c4038b8a680c99a2b4b160da05bf426402d287a0db4c4eb1cc66a949405188b632f39da381c72
-EBUILD colorize-0.8.1-r1.ebuild 613 BLAKE2B 7f29308163b312d2d4abc0bbb1f185cdea52a646b3832ec9fd25ef3f26301cb1127295f0f6d55e661767274aed77378892faa2ed8a4587beecf7a1ebefa65b5b SHA512 f6cf4695e5ab6ef97d3797903126ef4f8fb13ca116f0d69d4cfe260a6e87c54e7a837a459114f77cfab7debdcfce38677b0d2b37827888433d02c6e11104f1d2
-EBUILD colorize-0.8.1.ebuild 651 BLAKE2B 8cbe4ac1b87e086f85438c15c01e0073366dd8efbcaae011eede9a902a638ddecccb0175e787d3a5bbf06c3a63111b28192bbf5b24b27668d8e3279eadd2d65a SHA512 d0d2615f1f5ff92deb8dc10139a91b62f4332c5fb7a60e9872b77a7a457b3cb03ce9b97e868d520517f393119b2633de95f21f27d0e7984ce8f7573fa691b40e
+EBUILD colorize-0.8.1-r1.ebuild 620 BLAKE2B fcd76ab62919fa7496892a4d0dff395b3aa5ebc7055a201ac390e8f5299e892d659a54d3b5c4b7fd1b88820eb1521bcfa053b0cc26ade8fa54d3d909fe5d824c SHA512 900766be07fc77ea35ceacc13d530f41c5c415c676634c5d07fa02f8c9dc59c6e2032ff2c55faf1a9f6aa94ccf0c6062eee57eb00c4be820e387c6148842c250
 MISC metadata.xml 343 BLAKE2B 7b31d7efac937af32901ebecaab49e5ac6583720e8411120c77ff3fa154a2a3ec90ea4e13049d1cd2919f13338b51860d77f5d1c3502d71443431d96d8712d59 SHA512 b3a5fe75e52041f21ac82b6b1c78e52952754501e641a328fe7a6da9f2805e09693c96b0c25dcc2f74c2aa07f9122973aa9155f394ceef66386ed9b9cb52e879
diff --git a/dev-ruby/colorize/colorize-0.8.1-r1.ebuild b/dev-ruby/colorize/colorize-0.8.1-r1.ebuild
index 69919f193d55..9cf49b11f5e7 100644
--- a/dev-ruby/colorize/colorize-0.8.1-r1.ebuild
+++ b/dev-ruby/colorize/colorize-0.8.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
 
diff --git a/dev-ruby/colorize/colorize-0.8.1.ebuild b/dev-ruby/colorize/colorize-0.8.1.ebuild
deleted file mode 100644
index a4c0a8d2040f..000000000000
--- a/dev-ruby/colorize/colorize-0.8.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Adds methods to set color, background color and text effect on console easier"
-HOMEPAGE="https://github.com/fazibear/colorize"
-LICENSE="GPL-2+"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Cc]ode[Cc]limate/d" test/test_colorize.rb || die
-}
-
-each_ruby_test() {
-	cd test || die
-	${RUBY} test_colorize.rb || die
-}
diff --git a/dev-ruby/columnize/Manifest b/dev-ruby/columnize/Manifest
index e41762ca3502..d3227fead939 100644
--- a/dev-ruby/columnize/Manifest
+++ b/dev-ruby/columnize/Manifest
@@ -1,4 +1,3 @@
 DIST columnize-0.9.0.gem 16896 BLAKE2B 46821b72e3c0b70b5788002904fe6079dbab28f9f5d085ac269de8b2765c00f22294bbb36a288ea5688baf3a0bfeed9a4edfbe78eb41be67321433032ec99811 SHA512 b85f478db0e70740ff2d09e0c0a0e6eef378cbd0f025f8583726619412c0dd93ce85705978550ed13713f35e90db846ff087110c210742dfc3223bac3da7176c
-EBUILD columnize-0.9.0-r1.ebuild 438 BLAKE2B 885b3f8d598a9ec31c36a82458f71369ce509f57ebdca1429bbc2c2ac1b97524fd56700955f712573b7b2dbd73a63f67d695aa0ffa56f4981fa020ca39343b5f SHA512 782e7dee2e809946fc8bf4f1e07e1a4348a697b532e6fce8e37085c73ce95283ee993e3a59d155acb32861a6afbcdf725564199bf85feba0da51972ff1ad37ea
-EBUILD columnize-0.9.0.ebuild 471 BLAKE2B 2d3026cb4e5bca273785f42e38b35d05d261c3b786a3f7455551ce552e4a2c54ae04afaab8edf02667ff3fec77e6547c4bd0484213b1cbe18ad1d4c2e637559a SHA512 c528d033e21f1254ade9b7faa81339527d6d344aa7c7a1b7c0049b4d96cfc2833aeb9403d9bf6fec1bb03a049b7be16d67415e8f4b855301f1a84d4432beaeb4
+EBUILD columnize-0.9.0-r1.ebuild 445 BLAKE2B 4b31c16bdff907aedd589e1536885201d09f88042032b1ceaf781d2b4666bc7796722938d241dc588fd5dda92f64469c7976d4be1f5dd00b9dd5aa7356e34ea6 SHA512 201abcdbcbe83ee6ead977354757180a459f24b58606795a4ddc5a525519c9f112c38c86bd9e94a9269cc7103cc7147b4ab6b939699454d83a91a4cb34517d4e
 MISC metadata.xml 341 BLAKE2B 45b716657f22cbc7a5c47f5e07e197985aa2aa8deeccc86af0b07a857b65792b5f39dc7d065da35760616ac7687bd8d0d22a3335d07784cefb440b250d0cb1fa SHA512 19ae7edab72e2555852fa43f403a7e2b83970b02122dcf829631cae1b558a66bcdd78425a7f62d6aea6d67b79c2b00324afc1ed608bcb217f130cc74ccbee74b
diff --git a/dev-ruby/columnize/columnize-0.9.0-r1.ebuild b/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
index 730e60452821..1307826334f7 100644
--- a/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
+++ b/dev-ruby/columnize/columnize-0.9.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="AUTHORS ChangeLog NEWS README.md"
 
diff --git a/dev-ruby/columnize/columnize-0.9.0.ebuild b/dev-ruby/columnize/columnize-0.9.0.ebuild
deleted file mode 100644
index 674fa5804146..000000000000
--- a/dev-ruby/columnize/columnize-0.9.0.ebuild
+++ /dev/null
@@ -1,18 +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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="AUTHORS ChangeLog NEWS README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sorts an array in column order"
-HOMEPAGE="https://github.com/rocky/columnize"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
diff --git a/dev-ruby/css_parser/Manifest b/dev-ruby/css_parser/Manifest
index 8e56f5773e08..949fad6b7678 100644
--- a/dev-ruby/css_parser/Manifest
+++ b/dev-ruby/css_parser/Manifest
@@ -1,3 +1,5 @@
 DIST css_parser-1.7.1.tar.gz 33667 BLAKE2B 5732461958bb3abe7578c3898bd80c601fc957c38b3feda5092d89c4419cd64f0c6e4be296919c07bea5e9082cb03f32bfe9255244b56206caa7bab8e1a29765 SHA512 f1dba16fa18362e1b58d463a1f718c4c981170f3a7b0b719e5a309b74decded063cd3631540a4b76c1d78e5cfa92a35b56130979d7724d745eacdc372c69dd9b
+DIST css_parser-1.9.0.tar.gz 38201 BLAKE2B 6d2042429f7347613b14649e7c205e88a26dec9759a1634a3805e79e3f8599ab6b1ab2c4283dee631476e16580f447c08cd41327a62c813eb006a7e435787f9e SHA512 79ff06b471298f2fe82b096703c828122f1ae778b71fcac3f2eea1e243145729d3871c21eb1714777a2648ba91d05b9b973691b5ff41b2361eecb4170d3a2601
 EBUILD css_parser-1.7.1.ebuild 1119 BLAKE2B 998514f91ea75cb3410ef97c5200316870bea664762eedb560b594d541602f346e3f5316e7bb8703c81128965cb6e575cb4f5058e86b81c89a2f99120170a478 SHA512 a1b2a1d7af2da57d971a5a516e5ef1f4cc3f4dd89fc6ad8bff9f13f1a0a9d200963f1d318b57a59b7f8ee7f37a828a4fc0185e60d114b5c908e83c39d9f7e19d
+EBUILD css_parser-1.9.0.ebuild 1119 BLAKE2B 32205500f9a21e427021275371a82d32c447757c15328dff480efc85065dc41a4ba23b1aa4de281b9db5c48cc85db136f527940eadd8d0f41b24cb8e9753d4cb SHA512 b059adedb08d019516b75f8fbf789f0cf705566fca2e1198206244eec20605ad296f808132470e476bf93540d7b939edfb6c799c89ea756ee6b30bc9c247aff3
 MISC metadata.xml 346 BLAKE2B 982f54d9e88f4c45c010fa2ba5ed692af66ecb29b8384cf99075c8d919188a1635c9c50c5fd732ff20f204c0277ec85f2a000c4367d9ebd868c6f0e2ff48a694 SHA512 117b856fc53e92ff3c62ba01bc1e54f33e5f02c688aae98cb2754485094bb9f01dc3255ef05864bb944b01c9e8d37b7b622de42a38e4b9d8de893c16fec78d45
diff --git a/dev-ruby/css_parser/css_parser-1.9.0.ebuild b/dev-ruby/css_parser/css_parser-1.9.0.ebuild
new file mode 100644
index 000000000000..e725137e229e
--- /dev/null
+++ b/dev-ruby/css_parser/css_parser-1.9.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_DOC_DIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="premailer"
+GITHUB_PROJECT="${PN}"
+inherit ruby-fakegem
+
+DESCRIPTION="Sass-based Stylesheet Framework"
+HOMEPAGE="https://github.com/premailer/css_parser/"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/addressable
+	virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/maxitest )"
+
+all_ruby_prepare() {
+	# get rid of bundler usage
+	rm Gemfile || die
+	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
+	sed -i -e '/bundler/d' test/test_helper.rb || die
+	# Avoid tests using the network.
+	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
+
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/*.rb || die
+}
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index c9b60862102e..9f3f5122dbce 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,6 +1,5 @@
 DIST dalli-2.7.10.tar.gz 52106 BLAKE2B 0531247c1d615acd7d1124b8aceb5635088b55e5a85753f10b8fbd786ec3573f13df096e1537d9a31f3801632406f28d918de5971cb28ec31d6eb8387d0c74f1 SHA512 1b6308ef37d729d85741306c10bf87c9b9733f83f0b4bf089f3eced36c48cddd9a77d2fb44a77778844d1cafaa3cec5110a9c90f6a67dee08a96e163e6ccaf65
 DIST dalli-2.7.11.tar.gz 52341 BLAKE2B 5b3a2bc57f4b0e3a9ac0d24ffa3bba89ea38665ac08ef3d7760fa6ce74db21d323a18e74a4f3009165364332731d7c6890df36c68409afbe21d3ac096275f028 SHA512 8f299a19d95293370564b6337bbdfeb32d928e0a95bf5f5df962ea20b039f4765da1797513ca96cabf93309484575481a02fb1e0c6d227f74c81fc72f95be22a
-EBUILD dalli-2.7.10-r1.ebuild 1569 BLAKE2B c338dcbfcc866ef1c188d76e1b23c9c3818f7743794b0cd2d0853ab6694b9b2ee7c7d1309dd0a57ed1ae18158a57f082311ecb3603dd12ccca344135623d2b51 SHA512 39989fb31d37a878773ee056dbc3ae9bb4415c92201d14aa4778076ec7540a55f9498fe525859d4239c8671c6d16e347b35b99b5dd3b8119d364638217482dab
 EBUILD dalli-2.7.10.ebuild 1578 BLAKE2B aa257dd54dfd71304c5bf60d8373252466770d027a72bbb1c42af5e2c2593bc018c124208b8d78219ad3d6cd9ab6506117282bfc04e6922ff05dfede2a82ebe3 SHA512 0ce0ba0d10409a0531257e5f314c84b18839a0823941c0b5e36020cfdf55243002f98eb4cd4de64806e182c3f7a4559c5462e84727e6346c63f81476911a3162
-EBUILD dalli-2.7.11.ebuild 1575 BLAKE2B 4f3f039c7aecef10166a75fac7737b6333a5ab453024cb08b2122e2d1dc1b75c9da290f9d2b6ef57b7afe2a72901421a82c5ac334d7b4566b34471200beebde1 SHA512 2d32d3b7f32669a571b7a52b09f42409972df0454ce344622e5b9ccee822f31d2d715a506c787cec76aec32b82e2b3babfea6208909e358238c67b2938786544
+EBUILD dalli-2.7.11.ebuild 1574 BLAKE2B 5c873d42d667a2683c29a5eba6338330cf95eb5d5e854a0b9ec03dc94ca7c339538784dd58c9cc768bb8e2d5d216a4afc185289dbaeb5371dc52e9213a7c905c SHA512 af31e416ebf86d7db1e7ced950178d2e6489d44a98e2179949fd352ef8ad38c5bf322d6e9336a7a492ef767bbe97ebe477001664f5ab40d2878fb9cb46087f0f
 MISC metadata.xml 346 BLAKE2B e34b47009de19ff810f3c3893517533730fa09cc4713b5fb8ebc05011004e17466ca0a6e6df307e5748003a7b4c83691d28ca0d80b423f6f870c4f7fc9be88eb SHA512 22b3ca0c5024974556840a2cf47ffa0dac63b6a4573d2ca6244c3ec9231b1c8321c7f544bc979882a6bb6ca37545b8ccf4612ce9ffd1ab34521b24e896f57e41
diff --git a/dev-ruby/dalli/dalli-2.7.10-r1.ebuild b/dev-ruby/dalli/dalli-2.7.10-r1.ebuild
deleted file mode 100644
index 3dbf8da372c1..000000000000
--- a/dev-ruby/dalli/dalli-2.7.10-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
-HOMEPAGE="https://github.com/petergoldstein/dalli"
-SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
-IUSE=""
-
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest:5
-		>=dev-ruby/mocha-0.13
-		dev-ruby/rack
-		>=dev-ruby/activesupport-5.2
-		dev-ruby/connection_pool )"
-
-all_ruby_prepare() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
-
-	sed -i -e '3igem "minitest", "~> 5.0"; gem "activesupport", ">=5.2.0"' \
-		-e '/bundler/ s:^:#:' test/helper.rb || die
-
-	# Drop rails dependency which is only used to display the version
-	# number, so we only need to depend on activesupport and avoid
-	# complicated circular dependencies.
-	sed -i -e '/rails/I s:^:#:' \
-		-e '14irequire "active_support"' test/helper.rb || die
-
-	# Fix test compatability with memcached 1.5.4 and higher
-	# https://github.com/petergoldstein/dalli/pull/672
-	sed -i -e '/memcached_low_mem_persistent/,/^end/ s/-M/-M -I 512k/' test/memcached_mock.rb || die
-}
diff --git a/dev-ruby/dalli/dalli-2.7.11.ebuild b/dev-ruby/dalli/dalli-2.7.11.ebuild
index 4dc53f6b7530..a738b11f04d1 100644
--- a/dev-ruby/dalli/dalli-2.7.11.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
 SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"
diff --git a/dev-ruby/dbf/Manifest b/dev-ruby/dbf/Manifest
index f8e27ddd0122..eb5f1c2b7248 100644
--- a/dev-ruby/dbf/Manifest
+++ b/dev-ruby/dbf/Manifest
@@ -1,5 +1,5 @@
 DIST dbf-4.1.2.gem 127488 BLAKE2B ef371ddff415b89559209cd2d440e0c3359e39b9c7a3391940bcc25d96f61e2c57368d86430a09c7883d4cc7ba34211281269e8633a6dc469f70164266b03bec SHA512 47ee8d78ef31fe0017ae4223f06dbe576e43c0840b7cafb88def7b8492cba244d2382dea975a998355aec3aee31defd781bf0e08fbea6e77ef3dd5a927a7ad2d
 DIST dbf-4.1.3.gem 127488 BLAKE2B aff62a0cfe636b987989a21ed5df2094ad09748603a73df42d02f8bbe1032031493d038267b7c33d928d71d164076194dbd97331e36d1e8cb2472747c92e8b7d SHA512 4baf9f69310656ba191643b315576c1020a24cec19740ce543f349996067293798989b4e203861392cbec6f06bb117b51a1f4358a6122f5e2abb9b44edf26cc9
 EBUILD dbf-4.1.2.ebuild 479 BLAKE2B 65c22c5c7d434e808dae89029f04648cc55670d172fbb38d9b44177a82de1a4a93a8db77a543fece70383f2ef441d24f0e0e33820a23df8628f1c1d6c0e7bae7 SHA512 b4f494eb365e12996d0c604a17d9d836b38bfaa72296255c9baa2859e1e22fa1632b984e6b586dcbe9ff667142298ee65f9fdf501e7a7d930637e07caa305979
-EBUILD dbf-4.1.3.ebuild 450 BLAKE2B c5f7164ccd807219c96c619fc224094d3804956ed403791ed029610640658113a18a732547f4c4ce15011983bd2f9ae89cc49b30a4d1b7c3a9fd017cf48962f3 SHA512 ef8fef22f10a708fd4f84972eea4f68f8b10b0f5a6876119bf2c3b9a4cb7e7ccbc6419efac5731124c0b9229321488f4d9e197a7c95c3f9aebf3b5507bf01c60
+EBUILD dbf-4.1.3.ebuild 457 BLAKE2B 5582e02d07f4b6433b24eae58f9e940a913446bfbb6fd6cd548bd2a4a651b887f02ef8c5153223a268592b38d6341a1be6225edea9f1acd99ded0ca3082cd405 SHA512 c0cd91af3c0d7217d35cc0e8194b4b1210701f1a6820c73ed2c6aeba8c5ce0fe1f08a3591441d6a21ffe91f53a4be0225a3123296c8926bb7e17866f104cdb30
 MISC metadata.xml 473 BLAKE2B d563d50bcc5286aec5a86a72bd5224e9a08d3369030fcdaae80fd3380462cd00e93c613d17552aa35ccf23440e5fbb78ed8ceb9c4f9b3b97af8591a514d5ce9d SHA512 5e46d9be66b6236bacb4089909d40de9b2124dc5fd1e026807c4e6fdbb70e25aa32bfc3fd150b92168bfd7764fa8ff74314e48fa3bad897b34276d7f12722f90
diff --git a/dev-ruby/dbf/dbf-4.1.3.ebuild b/dev-ruby/dbf/dbf-4.1.3.ebuild
index ffd45ca9ba9c..524023b41d29 100644
--- a/dev-ruby/dbf/dbf-4.1.3.ebuild
+++ b/dev-ruby/dbf/dbf-4.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 5d06e1d3f776..351d0497c866 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,5 +1,5 @@
-DIST dnsruby-1.61.2.gem 257024 BLAKE2B 9b87f0f7e1d3062d30128b131e0ba5fdf7dee8114e0e86f6d63ca79e15db686b412906b685a7db0571fb5678de5148cdb59c0e67c6402c193e13772645be31ba SHA512 39ba76a0ca5073b5d03172754f99fad31c3a9af9e2856b930364eb2a5859619b56a1adbf5c84ccae085afcfdc2e32ffd67cf2a92a4e6150b3a113a03e5c7503d
 DIST dnsruby-1.61.3.gem 259584 BLAKE2B 578d6f2b693de5007d4d15350a4fc6cb948f9e16ee9b0bb511e6b6dc92cf828d30e645522b834a6d42af5dd94b85f0675332b2363e0c2ba3b97c9b35b73bd82f SHA512 4cdf6d83c39c3209873e9bbd15ba33f851f3fb878cf746de98cf615b0f547dfc5af8b4be7d505f87f581755ff73de079b6ea3f6f8c5a11074c1c46d5bc9e8c07
-EBUILD dnsruby-1.61.2.ebuild 804 BLAKE2B ddedb471aa5a30dd7b7631d37133e0809af1527104c27ebcce94201c831bb383e8e7fc2a919c143635c0d5db5f451ecc9615fd2b9fda48a1f5699b2d1324bf8a SHA512 2b42b776e2d7ad97ef53ba4e74fca3e2b1d80021f115b897f230ffe74813453f72da23435259ce2d3a3790b0157e0e109060055a07464165b7e60963b26a0feb
+DIST dnsruby-1.61.7.gem 261632 BLAKE2B 28accc37bc8ca99ca348acea3ead30079f72deeff39d31b323344b758b874fca23f65ea7b6f8f8c780d74de491875b0e4a11354af14b5064cf7aa329a7a94a4f SHA512 454378b7eca03483533ca1c1e01a86361c20ce88971ecc6adc72e11bb9ef03709ea1332d2549eefc1c41ed13d5a752b1a7f76e2117ffc9076776663ab6e02d1f
 EBUILD dnsruby-1.61.3.ebuild 846 BLAKE2B 83d74ee2270400ce80dab80080347ac666fa93e7e09daedcde22c11454feae702f2fcfbd70d9eeed7a5c47152e5dae16d431165cc5c334ed7e4b8a500433bb69 SHA512 9296d7e6206d0d3fd93ea534be6a9514744067c2b05c1ea957ef15ec9de2fe0d2966dcf570f9ba4a028a5cd8497e27bc9e3bab22b2b8c55e720890e4178000d7
+EBUILD dnsruby-1.61.7.ebuild 834 BLAKE2B 483e110ce967a16382d22af8124952ec3c1dad7f20dcca920b0333cf3b8066672d96408b93b116684de514697d489c90d9b6c53237050c8fcf82d69b9fb01b87 SHA512 c9afc4137c0ffd57e928797bba362a7b0c13778b6149416033bbb04c61a0305f4f0cfb6b15631249d966c73212927ee364d6f5fba76522cce5a884c89c7687bc
 MISC metadata.xml 413 BLAKE2B afeb40e610311f15b7a95117ea91507e9cfcc0e26903cab7e58f0af5dfce580dd782e96338a8a6a7573cb3ac12497541c2c3284fac9f35b045d5a26608c5506f SHA512 4badb70d7bfddbd8d242d1b400672691ccf737a329e365321dc403dff791669417ba0b0df62efd1ad1c5946e11a7756b22a2790b171e3629d2d30ebfefc5c0f9
diff --git a/dev-ruby/dnsruby/dnsruby-1.61.2.ebuild b/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
index 2653a5accb23..17cf8f6cfbec 100644
--- a/dev-ruby/dnsruby/dnsruby-1.61.2.ebuild
+++ b/dev-ruby/dnsruby/dnsruby-1.61.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_DOCDIR="html"
@@ -13,11 +13,13 @@ inherit ruby-fakegem
 DESCRIPTION="A pure Ruby DNS client library"
 HOMEPAGE="https://github.com/alexdalitz/dnsruby"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
+ruby_add_rdepend ">=dev-ruby/simpleidn-0.1:0"
+
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/ed25519/Manifest b/dev-ruby/ed25519/Manifest
index bc9cc4fcb446..09e7617b85f9 100644
--- a/dev-ruby/ed25519/Manifest
+++ b/dev-ruby/ed25519/Manifest
@@ -1,3 +1,4 @@
 DIST ed25519-1.2.4.tar.gz 136685 BLAKE2B d0fd78f16df2b09f5835fca4b0963cee930e17ece2c4eea2cbf4544ed1a5e30c7dc63525b285f4e1e150e5e70d1e8207ca07ce985c27441a903c69875fd92dee SHA512 cf2de7781848d804f3a279baef26f887846d7d846d225293c74dc3f4e301d18518c9edc8b721f9637fff8f087703e91d2376119f2d8185ef19be5862f99801b3
+EBUILD ed25519-1.2.4-r1.ebuild 703 BLAKE2B 0561ccce45a1ce1c45c093a233c5beb3d5ece47bbde5d54a2b8218038371f50cf9be4ceb50dbef52139128f16a9f1b871502b8b6f24512f6e19caca4692b892b SHA512 a2f56f1f4a977fc563c5cd2cfb528736259c9830b82401e51a87ecbc97533bafb81e181b87c2d29764e88bdbc741d5601b0e2c68bfd4947cafb3a5e2bea6c026
 EBUILD ed25519-1.2.4.ebuild 815 BLAKE2B a58c3884ae37997621baa3a286096dbaf7ea304bb10f059549b4c8535c8db1b3b5b31940cd1f3f037f25b636e55687dbd5b1c68ff250a447e886366f6f4c8622 SHA512 4e8b1e76e7b9eac7aa36a4d18d6921581927e1dde8d759adf13bbdaab93ea4ead06f6c3e78f65c1a04e5130fc5c3ab130925195496a0c2693f5b7cef1bbc26dd
 MISC metadata.xml 343 BLAKE2B cda5dfa27c8ad6f26c92ebb6ff29d1d861211716018a37c1b4e5736191b9c9b1805b4f9cb05817345af609f0df7b458e3d223b9a2d79e213098ca08bd7457f5e SHA512 68f441e5fba00bf886e2035f32e1f16522340d762b0872f39783d8d8659044c69e63d6b36f401adf2519c5e160c88aa39fb5bed58ea64dfcd607b2e72d8a6918
diff --git a/dev-ruby/ed25519/ed25519-1.2.4-r1.ebuild b/dev-ruby/ed25519/ed25519-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..3b2578925016
--- /dev/null
+++ b/dev-ruby/ed25519/ed25519-1.2.4-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ed25519_ref10/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="ed25519.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for the Ed25519 public-key signature system"
+HOMEPAGE="https://github.com/crypto-rb/ed25519"
+SRC_URI="https://github.com/crypto-rb/ed25519/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/em-websocket/Manifest b/dev-ruby/em-websocket/Manifest
index bcae6789fa54..3a62a878c28f 100644
--- a/dev-ruby/em-websocket/Manifest
+++ b/dev-ruby/em-websocket/Manifest
@@ -1,5 +1,3 @@
-DIST em-websocket-0.5.1.tar.gz 27792 BLAKE2B 5aa8b9b9a1bf7066086c3115358a01054dbd24c3b9e7b454210c653aa25face2230e5504e0fc3a13d4770bcfcdf5d792c1914f173ec8d83d1b97ee7c169636af SHA512 ca2b4e2e4be663a5932fe63ed0efab169fbee9aec50f9780c1ee5df0efa300acb58410b97a22d5d10a2cb9195c2a68f6c71bf4e070ee6d915c6abf4015aa5d94
 DIST em-websocket-0.5.2.tar.gz 29367 BLAKE2B 91d41044e20f1f8277527205e3ee6671de2a1fb9b433c18d5b48a166c7cfa53c6553e32b726326f126981f0e014625075bc918b71e00bd8a6919670c370b6cab SHA512 46df705e2af93082884c7ca521df4f6cf33309c441eb3ba96be609b2cf280e3b72c689810d55279db6dbbc178ed843d64ccdaf9d4b39d52ddac7d84956065b06
-EBUILD em-websocket-0.5.1.ebuild 1219 BLAKE2B b8464ae42fd32e389bbcf0eba7ad9a05e282e59539476ca929b7c1aae714c8a9b8df1401f886901a70ad4c58789204f2bddee37bf195b739c9d97592f37995db SHA512 cd2221aa8529d213f468ccd028ae6417e0b36a7df8e6b4814296f91b4f0c62f20d6edc962ba5f82ab3085e91c83ebd3c2143e6d9f1a09755f004e893c052e6cf
 EBUILD em-websocket-0.5.2.ebuild 1143 BLAKE2B 634717168adfcc2fa53f2a009cfdd8982d585b1eb64505ce972e38be87faa7af0617af624910ed1a2f2c65e06a119d93c8f22cc39ca4d55dce9ac973bbe9b5f2 SHA512 ead1b15f00bff35b981e1ffbe29edef22bade03fe782f0317fa91ccff0c4aedd467bf3de1817f2ce0954193c359f54d181d830fed858743c9823472857e81ee2
 MISC metadata.xml 458 BLAKE2B 59015f88eb8e2a4d6d538febe271bc6c9cd6849db0f9a8a11125f6efe9ee15c437603d498412aa23e16f506fa44317314762cf9b4302d938c4bb3913a9e4418d SHA512 ea01b58e2eb6ab8a23418be9140c28f8849382014a12b6aa3910d12a6614361b63d2fdbd31b6c099df38c4223dab330425885af6943ce87b4fecf4edc13b7b68
diff --git a/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild
deleted file mode 100644
index 512289f84e58..000000000000
--- a/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 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_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="EventMachine based WebSocket server"
-HOMEPAGE="https://rubygems.org/gems/em-websocket"
-SRC_URI="https://github.com/igrigorik/em-websocket/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/eventmachine-0.12.9
-	=dev-ruby/http_parser_rb-0.6*
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on git
-	sed -i -e '/ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Only run unit tests since we require unpackaged code for the
-	# integration tests.
-	sed -i -e "/^require 'em-\(spec\|http\|websocket-client\)/ s:^:#:" \
-		-e "/^require 'integration/ s:^:#:" spec/helper.rb || die
-	rm -fr spec/integration || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 9216881c1616..c415f02c81f2 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,11 +1,5 @@
 DIST fakefs-0.19.2.tar.gz 53405 BLAKE2B c9841f7f2aee5135d149187d03f7f3034d3c6cbce6d33d3710fcdbd936b4599561c857dfac81f13262da6f067a843d0c3159abca0e8be7f77c95ff20e8bd123a SHA512 e27eedff44c3ff556b0e7a22e434205e54847a6f6b03a8ab7604c2f2e9abf8be7d5b8d29bd51e24cc032dfb3aaf7940060c3dae5532b0921e363d2213b12ed90
-DIST fakefs-0.20.1.tar.gz 53626 BLAKE2B 013f49b57355943eb6624540be93bc069c95409f9e1d49c8cced034656f596ee98fc3ee4dd40cb80383d447164f11242e16a5ffb9b35ba2e28fb136e0f72a09e SHA512 61d83868a0cf4d0abf071fadc9ca21176e3ef8f2ccc781760a8b0b3e55713750d3e952482e90a87e8665163a262e8bdef8e6b2f3c423fabe696d64f356862aa4
-DIST fakefs-1.2.1.tar.gz 54106 BLAKE2B bd1128871a36dcf8f0137c9ee13c581cddf2ace5a2959e863c66e52dc5b682c75e0f4507c7d939f6725bc1b5a8446e1747d188b98b1cf557c0d1fccd1d3c7040 SHA512 e18d9c1c5ac444f2a9db362dac3c4563f27c4f9b6e6870960e85882ab28dadee53bd56f6933f6317d3128a5ad3862980fa9e2a72cbf7352c58c18a6cee68163f
-DIST fakefs-1.2.2.tar.gz 54072 BLAKE2B 6e1865377c6586fb409f6392b0313e750c1810b9479c120622757f711da55644e8224c8245ce0ac187c6d531a80ae54081add5572b5170f367fdf1d58b4df924 SHA512 4bd0995a1dca27a15da49962b0fddc1daf1e11f88767bcc36e57883ec62e4270d5d6873f52d64859301a5f186e467d368fbfbc0dcabfbfe24bfdff6b6a14389d
 DIST fakefs-1.2.3.tar.gz 54054 BLAKE2B ae8202b7f28d4d1b326e016d96382b7cfaf012fb842d63150bb09b6ddb5de96bb6d548635877d2d057137bbc23c46c30340ebae3641d70d7955f609bb4cc4af2 SHA512 5051a3b81ba5919cdb6cd4a92f4e6af6ed5140afb35247b1775f4602083e23f903c582e038596a3bb27ab3f69128ef3d9fc2635d015fdb23babf21ff200c4692
 EBUILD fakefs-0.19.2.ebuild 1062 BLAKE2B 92c1f1feb018629ab6bb310d1fe11387a9f5a5eb549b0d6c00d5edde95db4ec4f01653c316292246710e713746ba1ff35be062af3a3a01d28224a907881f78fa SHA512 0b86d994e4451ed4d8ea85d05c475dd9e3c40441a251c30c8beb8a638847965b6889c4c126921a44a7c347fc90ba2e19e20a4865a25d7ca211eeed1c62227fb8
-EBUILD fakefs-0.20.1.ebuild 1067 BLAKE2B 698aff2437bfe1840386002d11e156084b512d13d30ef03895d81c46139e570bf0afc540acc7246475efbda67bf3f6462ebcdc8c45170878327beb2cf9769263 SHA512 c7a97751ca2bbea8713e7fe8f1f82407d6b167cdca2e5eb1c08a6ee79fb8bfb592ebac210bdd0968b4848fc7733ca742b77d0975ef39fbcb52cfed9250043715
-EBUILD fakefs-1.2.1.ebuild 1141 BLAKE2B 3cf361bb7c5625312868bf64f710e772706a2a8555022b511c4360405f63e58ab7a060e56f07d0f05837f2968a0b2e5a802bc059ca9a7f55257591e449ffe543 SHA512 b02ee9eaf32ad535b6a1071a161093b4d4e7dde8c53b101b6a4287abbf026b8ceccdb396a15a1d45f3db531d388d5cd48eef4fd512ea2e1e3cd9da1fff0372a0
-EBUILD fakefs-1.2.2.ebuild 1143 BLAKE2B 57e0bbb8d30020e21beece038e497aba0639114dedb1f2fef2de731f5395df9492b2a909d635a4fbfc3a946fd9ddefe4498ac771c57e707c67e8112bbaf96616 SHA512 d32a68c75df57358bd5c47baa41e5ccee9c6dfcf0369ca6103701961aab0453b36683936ef344150a004a5a457de6a9df4681aeca540793a8bfd957ad1bbf145
 EBUILD fakefs-1.2.3.ebuild 1136 BLAKE2B 46769de8301a23b4237ad9f9657d9d07cc75f6eee1c82f43241e6d021da34ddee8004e849e47692169a2d7c532ea15534a93bfda0d4269c72f320c9f35298511 SHA512 45f34cf31d76e80e80bd9357be59773c47fa91a4d38bb01c230eb160614978efa2a920a49d1e24a0904c1f3affe1fc2ba8bebb9614e823bc3fbd25851e3fde92
 MISC metadata.xml 340 BLAKE2B a31a62212f53154af4d3dce332d30eab8433785cdcb07531f743a5d48f3e7d9dc55580651cdcc765d4dcea5d27e78902624d475f8ae052efc6d9c2eea8b57d0e SHA512 1369c8941ac7aad5dd54222a870a5d173194c4f241093864b25abc1ca97e9f55d8fe928157c11ed63d2281352bbdbf6779cbc00abaac206fd024385ed5eb8478
diff --git a/dev-ruby/fakefs/fakefs-0.20.1.ebuild b/dev-ruby/fakefs/fakefs-0.20.1.ebuild
deleted file mode 100644
index 67991e1962b3..000000000000
--- a/dev-ruby/fakefs/fakefs-0.20.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 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_EXTRADOC="CONTRIBUTORS README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/minitest-5.5
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/fakefs/fakefs-1.2.1.ebuild b/dev-ruby/fakefs/fakefs-1.2.1.ebuild
deleted file mode 100644
index 6de4026637a9..000000000000
--- a/dev-ruby/fakefs/fakefs-1.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/minitest-5.5
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/fakefs/fakefs-1.2.2.ebuild b/dev-ruby/fakefs/fakefs-1.2.2.ebuild
deleted file mode 100644
index b438141a820b..000000000000
--- a/dev-ruby/fakefs/fakefs-1.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
-
-RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fake filesystem. Use it in your tests"
-HOMEPAGE="https://github.com/defunkt/fakefs"
-SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-3.1:3
-		>=dev-ruby/maxitest-3.6:1
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler
-	rm Gemfile || die
-
-	# Avoid unneeded minitest-rg dependency.
-	sed -i -e '1igem "minitest", "~>5.5"' \
-		-e '/bundler/ s:^:#:' \
-		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
-
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 68e800866fbb..c57b4b3c49bc 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -1,9 +1,5 @@
 DIST faraday-0.17.3.tar.gz 76786 BLAKE2B 0706f4386233861564aa1ba5fb8da9ad374a0b553a3f6ccd4ce6509b690f6da3e9f695f90605e0e15b41b6354841943ecc4f5eb826638565687bf62b36f1f456 SHA512 346e93b5d980626a0c460d9010ca09091faf84a1a8f2717c16d345ddc51585ce45959d7fcf41fbd0ba248d38460939544945fa0e81bcb80ab73dfe080182e325
-DIST faraday-1.0.1.tar.gz 835557 BLAKE2B ea5c32f0a93bcc4c4a0a7c55d61578b4e9f0173caed484c0c6424201884b8e81304c0fe07e1c1d6ffdbff41be85bdb494904c2a3b3e19b6c89b58995d9fdbfe7 SHA512 6a2dfd751d013ddc7cb005e262b48120f9a6ae2bb50564082ed5c5e47cfe2b07ee91d7d1b6967813d39b9874c7d5c7daf65ac773dd7afdcae65ed38698b1f496
-DIST faraday-1.1.0.tar.gz 838062 BLAKE2B 6615992046fcd2dd77db8407f8f658f224f690ff36236182174f7aee89ef24ab7789f1711f97b691ac96a9137404362f62c8277e32a0970feca44441ce8da15a SHA512 22f4cd68d409afbb3523713223325a516ec8aa79591b816f8510ab7d3b1e31acefcc2252e8fd23aa99b4a5592c1604c0cc28423f55f1633c331554e3405b11f4
 DIST faraday-1.2.0.tar.gz 840216 BLAKE2B a52d2ddc2a57ba87b28e9143123985df12e118d6a8062b5272e77aa7807d7b2fd770408090c7e406631173eb276efcb973f96efdb17ab0f3ea684acda41b8d34 SHA512 7198e8954ec71bdbdfb58df52c6962ebe05599bf871fcb669f32ee2a5fb094b6934492396a92033e0fa858390f454f0d2daa41616f9e212f260080be016e1ea9
 EBUILD faraday-0.17.3.ebuild 1530 BLAKE2B ed407c60c9138dc038c019689cdf9c2e620082c58c65f6cf08fc8bd9e2aeb728aa804e6545ec9a8059aa117968a61e9b8a300144e17636173318b6889173508a SHA512 2ca22991606aebaf97e281035ad9b1e166017a1cd2e29b43f363badac28cd4be2551bf6a1be0f38e76245f8a76c7e9fd44f8d79cc5f42922fd20190d8eb8719c
-EBUILD faraday-1.0.1.ebuild 2468 BLAKE2B 9ce92343c08047b61d8d29ca8a14a0d6b87b01692ca57501c8f62c5172534a063f3df054976f5b45aadeca19b02df22158e4f1367a063d48e9e56a25601c6769 SHA512 9fb4b89df5631582b76a18a0e04d949b126ed62fbf07dc054ac3ef4a4651c31302eb44584da9c6122d7a2bd7405d171bd735f8cad646bd50b7d6c3f935359924
-EBUILD faraday-1.1.0.ebuild 2220 BLAKE2B 0b306a51c345cc9352cb8e55aac1153ecdb49b345cf5614d0aced904080ca1f86083d748146cb5d92e2b92131a0452feba395e6f62d1a1d423dc5a262efd5c7b SHA512 c747da8118a85b7067ab117c362ffc095e73aa3eade1ace98adfc3be460d475ed661302fb69ba344ec64b9387900c9e13554e3f2726ca355b89aaae901bc3533
 EBUILD faraday-1.2.0.ebuild 2260 BLAKE2B 4d303ac1436ed45bd50ff06b62eede4742ab5be0e159013358fa85f15bd209df690a000f3a26dcb0359c3bc6521cde81d4ff4c2d3be5f9c40f8a0646f42f6a5d SHA512 21450af436ea955d572bb23b6eb21c8e729e40ff57d3f132e4d2c6055d12b1ddf76a22ac0cd51895f9f0dc9731b9e305e2343fba3a8fff7a5a7143229937d730
 MISC metadata.xml 344 BLAKE2B 818dc9570594eef636f7b37ef9322ea083998a0905c0f9f55e758df3ebfa9e36efe5a42d95a666fc5c613a38b9c3a28d55ef0b3f48573dedf786883957d1adb2 SHA512 10e3c69f600e5be2306aef49c4466e399a52e2db52c8b53b7430bf72d6cb8696a71fdaa3a212eb37d2dad86480ea949447aee3f3e224f020e0629e56b35582e0
diff --git a/dev-ruby/faraday/faraday-1.0.1.ebuild b/dev-ruby/faraday/faraday-1.0.1.ebuild
deleted file mode 100644
index cea98c0b38d6..000000000000
--- a/dev-ruby/faraday/faraday-1.0.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		>=dev-ruby/connection_pool-2.2.2
-		dev-ruby/rack
-		dev-ruby/webmock
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-	# Avoid loading all lib files since some of them require unpackaged dependencies.
-	sed -e '/[Cc]overall/ s:^:#:' \
-		-e '/lib\/\*\*/ s:^:#:' \
-		-e '/simplecov/ s:^:#:' \
-		-e '/SimpleCov/,/end/ s:^:#:' \
-		-e '/pry/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-
-	# The proxy server is already killed, may be OS X vs Linux issue.
-	#sed -i -e '138 s/^/#/' script/test || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid multipart tests that require an unpackaged dependency
-	# that appears to be no longer maintained.
-	rm -f spec/faraday/request/multipart_spec.rb || die
-	sed -e '/multipart_parser/ s:^:#:' \
-		-i spec/support/helper_methods.rb || die
-
-	# Remove specs for unpackaged adapters
-	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon}_spec.rb || die
-
-	# Make this adapter optional since it comes with a long list of
-	# dependencies.
-	if ! has_version "dev-ruby/typhoeus:1" ; then
-		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
-	fi
-
-	# Fix spec broken by newer rack versions, already fixed upstream
-	sed -i -e 's/one, two/name=value/' spec/support/shared_examples/request_method.rb || die
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday/faraday-1.1.0.ebuild b/dev-ruby/faraday/faraday-1.1.0.ebuild
deleted file mode 100644
index d745a606dfc1..000000000000
--- a/dev-ruby/faraday/faraday-1.1.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend "
-	>=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3
-	dev-ruby/ruby2_keywords
-"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		>=dev-ruby/connection_pool-2.2.2
-		dev-ruby/rack
-		dev-ruby/webmock
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
-	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
-	# Avoid loading all lib files since some of them require unpackaged dependencies.
-	sed -e '/[Cc]overall/ s:^:#:' \
-		-e '/lib\/\*\*/ s:^:#:' \
-		-e '/simplecov/ s:^:#:' \
-		-e '/SimpleCov/,/end/ s:^:#:' \
-		-e '/pry/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid multipart tests that require an unpackaged dependency
-	# that appears to be no longer maintained.
-	rm -f spec/faraday/request/multipart_spec.rb || die
-	sed -e '/multipart_parser/ s:^:#:' \
-		-i spec/support/helper_methods.rb || die
-
-	# Remove specs for unpackaged adapters
-	rm -f spec/faraday/adapter/{em_http,em_synchrony,excon}_spec.rb || die
-
-	# Make this adapter optional since it comes with a long list of
-	# dependencies.
-	if ! has_version "dev-ruby/typhoeus:1" ; then
-		rm -f  spec/faraday/adapter/typhoeus_spec.rb || die
-	fi
-}
-
-each_ruby_prepare() {
-	# Make sure the test scripts use the right ruby interpreter
-	sed -i -e 's:ruby:'${RUBY}':' script/* || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-
-	# Sleep some time to allow the sinatra test server to die
-	einfo "Waiting for test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/faraday_middleware/Manifest b/dev-ruby/faraday_middleware/Manifest
index 65bdc413e376..084a68a965fa 100644
--- a/dev-ruby/faraday_middleware/Manifest
+++ b/dev-ruby/faraday_middleware/Manifest
@@ -1,5 +1,5 @@
 DIST faraday_middleware-0.14.0.tar.gz 26313 BLAKE2B 2d925f0bd9e4a10505bcdd3b483ac7b8ed2c42dc1187e04069505216dc739af3f10f5c7f2252e3f474e5ddaf972a7b8fe009be9957e66ab625fe49c364a0d217 SHA512 d8e86da166022c04c12acc37981de446ba30050330dc0320eec0414157bdd6c8e92ff49ce92b390a2f5d457c396144dbde698d61993302c0ac416559e7078a8d
 DIST faraday_middleware-1.0.0.tar.gz 28279 BLAKE2B d881f59e106a695e2d41936d552fe6cb16465964fcb2107806123ea1b34ee6db8e82bb1e6fe3a0135af04da70b56a3e8c933e44591b3f75901642a1fe7a3ea1a SHA512 478dd04840c27120c162e5d9c764a210d4cc55ac54f2d44935942ab5195ee5a0f198a4cc0c98805029f3eab4596cc3963a763cda1fcc1ce6daf1811186e0b5a7
 EBUILD faraday_middleware-0.14.0.ebuild 1759 BLAKE2B aa619b492a17e2b4361d0e4f28a2d10c5c18b9f5628620e74639f5cf77ab53ac222dbe4cc3633577770f29bff53ce851aa4953572d4118e001ecdfc4bb915d9d SHA512 b0059c01e7f72f5910664fe1d826e87b80c741a876ac3ab23e0f5247a0f3028f5b4bb38bf6f33fc3adf4908a342a5463f45ef953d97ce04a1876868da0aa58ae
-EBUILD faraday_middleware-1.0.0.ebuild 1632 BLAKE2B 5e4c72e53cdd85e3417e864d24c4d0c1181c6fc6ad02f53785fcb79195ee89adb32858a2f30e1293bf7d738171f9911d992a735557fa2b80f12368d4f3cb4273 SHA512 d356320068e0cbb93102739128c9aff3c47c4121e9107a570fde1d97cb4e2b54076b4e3d02d63db8db820adb8b1a412bb81d3588b20f939de6c478b9d16834c8
+EBUILD faraday_middleware-1.0.0.ebuild 1695 BLAKE2B 494f0688de5319c53547112c920575b87c6a24bce6e61698f6c8aea0890359e6dddd04d1a5cbaf749497a4896231836472ed9323b49dc75895aec5c2f9427dc8 SHA512 344daac4c69f0f2afd180744e4d229b6294670802995fd6c8c08d124350b3c9bb752b88638e436d0678ea5e37e783575de930a7113973cc9b913c315ce703a8f
 MISC metadata.xml 729 BLAKE2B 684a1b5173fc890eeb563bafd76307f16fd74207ad0d16b08ea57eeac54e9975dc080dc19341c4cb9afef747d659a41d42cda8a43fa0a5a4f87f835e8cf08c7f SHA512 29fccc8e1b7554d73c75985809b7e9fece60e481f1926f4f8188fec19e32b3c4c02dca2a1fbe30ff2d6264e60a4f88436e3143d5a0137312e396a19dbfe79875
diff --git a/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
index 7434e8efdb68..3ad6b8513fdd 100644
--- a/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
+++ b/dev-ruby/faraday_middleware/faraday_middleware-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -55,6 +55,8 @@ all_ruby_prepare() {
 
 	# Avoid unneeded dependency on git
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '1irequire "fileutils"' spec/spec_helper.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index ef3981ba1b73..1945fa6fb43b 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,17 +1,9 @@
 DIST ffi-git-1.11.3.tgz 157081 BLAKE2B 57459d3aba7f54daf9c4d94993a083166efe5c37f3aa699279a07cac0ecdee533f54ee1ab36f7ee2a5cc43d0ebb386b8b3285102d98ffd18fa297e2e1b882283 SHA512 86a6a95aa5d4f005eb457fbe26b38e7b8618899db3de3459f3a01128aa7c488a47e50d13aef05ae83519178c80f2f7ed0a0280147d7e30aace13bbab82871f30
-DIST ffi-git-1.12.2.tgz 158344 BLAKE2B 903825d7a6d77e26be47ec7e7991253e1ba58b0f0049fd812f8c26dee6eb31c17388dd5f23270e84cf53c02ab3a73c79ecca870814e14993496d1ca0e99a5390 SHA512 2590ff3fd704334fe00de10ec5e08184c350feac36418e08680def0b4742c488f8168fa82759317e93cc3d7969af366254aeb157c84d07565e1804ba1678d119
-DIST ffi-git-1.13.1.tgz 161660 BLAKE2B b8a6c3f4b9bbd94378ab2adbf40c0bbf56883e34c6a1c12b9e1496069b8a4935b04012820699260f9cffd47efd78d7aa2d08e71a5bff9de740aa96ad11f499eb SHA512 f0077518c9ced54881e40a0047440edb4e40ba0ba89fc814a489bcbaf52e08e9a773e28f453f579162439e247151b994936695fe0b1ed5fb429d9bfd85b845ef
-DIST ffi-git-1.14.1.tgz 165025 BLAKE2B 020b3954ac08fc9fe077cc9116b21e40de8458eb79cc6ae1664d638c8a36df1e919cf6a603332f9513167b3f8d8bc342f04c2c1ee60fc9197d75de74fd69ca2e SHA512 8f3e97aa3fc3e5c404864d56b62d568ca464db741c1e526f971df4d96e61ebb8ce5899ecc207ba3d094efeaacd20633a250f2f072392a7369b179166bb780712
 DIST ffi-git-1.14.2.tgz 165100 BLAKE2B 598d1771860a7884f8dc6a4cf0006cb42f741308bdd01720d7ea4b63690d42ff6e93f2d48de7132f5d82b275b30672b0bf1ac586b713994b68e98da4cf71a481 SHA512 20fffab047d810ddea1d4d2b66a563adf5787a0602a26cc59724090d393852ae57464a8c7b5a47ca0534efc453bb06d2f8fbf00a203a7060cd3ac78b683119f5
-DIST ffi-git-1.15.0.tgz 167263 BLAKE2B 441b234ff8b5c65cb409451df60c8bfb5d4e071383e637b7864087ac144705d8f0dfdfb442971c4c98b0e1ed7c18b763c198f6d9c151b16de2a876a3466c369a SHA512 be1c6d85b91ad3148fe79628596fb800d40c1e1efc6efb67ab78c88a71b6f978492f6e571a9c9768956e9d4f3b5940df0de1620f30d63a2dd76e0fe31d357e78
 DIST ffi-git-1.15.1.tgz 167429 BLAKE2B 6012234f7145c5b291dd03f37d36c51b3ca0d14779b24c02da325b2075564a210566e64eb54caf4c32b4bbfe0c032f4d2c0a316c8c0cf559e14cbe6a922ebd7b SHA512 1e2cd70a8b921c6840b8b990d79819e2bc12f82c2bbef9952a59026de093002d1356642f6637f6bd7b0c94a6205401d88db6b83d1a479b4591c1041ca76f8e5a
 DIST ffi-git-1.15.3.tgz 167804 BLAKE2B a0d040cd87a0606ebf618bb1e5bf5189e03fa30d2a3681c8dcf2b075b8cba40fbc5d130d78bae0f31d1c20319299f106653576cdb89f355090df5de0c10d916b SHA512 25cf025aa51c5389c99f47043443d33859ce91e50d057dbd49b376b81b2d81c0d158785e9d7d8efba53b9ff450e49d43b475ad2c870822635d8350592f3bb3ce
 EBUILD ffi-1.11.3.ebuild 1514 BLAKE2B e9f0371a43b379abe302818e5cf837022f049bd66396554fe90abbf36754a8ae350733ea258df8a90e07165db6af5b250867396c3995202555ed6561f2f9a575 SHA512 f4e8db2b0a3e73d050178bfd92a5227ad74575e3f3ba6eed5f6be25fc33651adad54e8b6527532e713136a065e2385ef574b3e010dc5c08c930082e88ea32798
-EBUILD ffi-1.12.2.ebuild 1528 BLAKE2B 1d7207005ec67b4a0a2378a3652a439c9b19f7371c14b41aac973abf4d3aaf496ee146748df74e0734cff355a9cfcfa15724f7301fa23ca5936930fcbf3e9361 SHA512 c8bb83a35f41ecea01465b129194c16ea1d93b3fbc67147fb0cd297f6d5a6600342cd6f18543bd454a706121e15b3e770b2a4f16dce75d1333ce23a06949fdd1
-EBUILD ffi-1.13.1.ebuild 1528 BLAKE2B 1d7207005ec67b4a0a2378a3652a439c9b19f7371c14b41aac973abf4d3aaf496ee146748df74e0734cff355a9cfcfa15724f7301fa23ca5936930fcbf3e9361 SHA512 c8bb83a35f41ecea01465b129194c16ea1d93b3fbc67147fb0cd297f6d5a6600342cd6f18543bd454a706121e15b3e770b2a4f16dce75d1333ce23a06949fdd1
-EBUILD ffi-1.14.1.ebuild 1641 BLAKE2B 56bed9dc915a805e160af30e7f883d9cf30660937768ccfefbe38abc1f04934b98af1a90c05095855a8463f21f24a30953c8ef55e5a6311ee9463d447205e242 SHA512 8592be06dccc1b8c1464997dee29dfab2b6f3268f7ed5904d4fba10a239a3b4c3c368f46f84376fa023f37b243c2bed3111df8b75c5852b2f8cbd121cde092d5
 EBUILD ffi-1.14.2.ebuild 1576 BLAKE2B b8ea5c66d926ff7d2b7bf4c9443935e4a2274afc1a8bcf84abaafde9ec71e4313bd0392ff34aa12c47bb23852b53b559445e0b212142caf4a2d33641460578d2 SHA512 b5f3415732613101f21e60d12cfc5349e56b49eed982687d1ee98a76c4e88cd5868a6212361e41ccfedee70f237b5f7a8e9c4be8b7be3dece295e9cdcb658d20
-EBUILD ffi-1.15.0.ebuild 1665 BLAKE2B 04fad5bb54cb08a52525a413b04662e1e0fe4745b72bfc5aa7ac3bcd70939078cd2aa4860afed7f6a518d9b7f7b47f62162c3eb7d558a377641f71475d3fa766 SHA512 e5fe8935e8ffe610e9cf85862e29e6539792335787ab408df1ec625e3681d58117f537d49598a297731733d72c226d8a51d7af5aa7bf027154d0c81f30604e09
 EBUILD ffi-1.15.1.ebuild 1665 BLAKE2B 04fad5bb54cb08a52525a413b04662e1e0fe4745b72bfc5aa7ac3bcd70939078cd2aa4860afed7f6a518d9b7f7b47f62162c3eb7d558a377641f71475d3fa766 SHA512 e5fe8935e8ffe610e9cf85862e29e6539792335787ab408df1ec625e3681d58117f537d49598a297731733d72c226d8a51d7af5aa7bf027154d0c81f30604e09
 EBUILD ffi-1.15.3.ebuild 1665 BLAKE2B 04fad5bb54cb08a52525a413b04662e1e0fe4745b72bfc5aa7ac3bcd70939078cd2aa4860afed7f6a518d9b7f7b47f62162c3eb7d558a377641f71475d3fa766 SHA512 e5fe8935e8ffe610e9cf85862e29e6539792335787ab408df1ec625e3681d58117f537d49598a297731733d72c226d8a51d7af5aa7bf027154d0c81f30604e09
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.12.2.ebuild b/dev-ruby/ffi/ffi-1.12.2.ebuild
deleted file mode 100644
index a1ce25ed437d..000000000000
--- a/dev-ruby/ffi/ffi-1.12.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" dev-libs/libffi:0="
-DEPEND+=" dev-libs/libffi"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ffi_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/ffi_c V=1
-	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/ffi/ffi-1.13.1.ebuild b/dev-ruby/ffi/ffi-1.13.1.ebuild
deleted file mode 100644
index a1ce25ed437d..000000000000
--- a/dev-ruby/ffi/ffi-1.13.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" dev-libs/libffi:0="
-DEPEND+=" dev-libs/libffi"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ffi_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/ffi_c V=1
-	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/ffi/ffi-1.14.1.ebuild b/dev-ruby/ffi/ffi-1.14.1.ebuild
deleted file mode 100644
index 76dc45456e47..000000000000
--- a/dev-ruby/ffi/ffi-1.14.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
-
-inherit multilib ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" dev-libs/libffi:0="
-DEPEND+=" dev-libs/libffi"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	sed -i -e '/require/c\require "./lib/ffi/version"' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ffi_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/ffi_c V=1
-	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/ffi/ffi-1.15.0.ebuild b/dev-ruby/ffi/ffi-1.15.0.ebuild
deleted file mode 100644
index 244b9737ea49..000000000000
--- a/dev-ruby/ffi/ffi-1.15.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
-
-inherit multilib ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" dev-libs/libffi:0="
-DEPEND+=" dev-libs/libffi"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	sed -e '/require/c\require "./lib/ffi/version"' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-e '/^  lfs/,/^  end/ s:^:#:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_compile() {
-	each_fakegem_compile
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/flog/Manifest b/dev-ruby/flog/Manifest
index cbcb35c7673d..500f5919c93a 100644
--- a/dev-ruby/flog/Manifest
+++ b/dev-ruby/flog/Manifest
@@ -1,3 +1,3 @@
 DIST flog-4.6.4.gem 26624 BLAKE2B 27090f9a47619b63c8c34e0d6992c1d0ff29193a7de3af839d72d5754c2b149f38c1c1e3caec981170c408123bc38e3fc3e38e87fb9a83818e1cb356d31070c3 SHA512 495601bfc560c2d18973234c41706aa07b76ea95bc3803f93fb16b42ae071b65fc9a1c36e8d4a9bfaf3c88a1167ab714f4bbc7a982b9e606aa799f8480a23f4d
-EBUILD flog-4.6.4.ebuild 607 BLAKE2B f8e542dfc3cba0b807af3c6a67e3b1a8967d05720dba93d7611cef9aace379b890b39472f20cff0580cb21247dd8ce6a316a19395525a254b1a80ca62c8526ea SHA512 f92558e548665a69b4e578fd328e75612df4873f79e1379f03bd2610388898d10b7227edfda2d132a99e9b9177d1e06a8931b4651aa040ec2e1b7da15b2c98bc
+EBUILD flog-4.6.4.ebuild 607 BLAKE2B fb082d88645917c8e0a785b327daabbceece093fa99e92abc88aa88ee8bf0dae91b500343223c9222878cb79bd5903351e6ade59750537b45784c34e006332e8 SHA512 c0733785b5cb1fb7b4ef8b64df0b779d544bd001ae9c39baaed9b48d684da5e7dd9b27b02b0907e6132cf9a57b99e81a4af0d4b42bf03d44e01c08b2272f6c3b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/flog/flog-4.6.4.ebuild b/dev-ruby/flog/flog-4.6.4.ebuild
index 75c17d704f75..3d36c1b55794 100644
--- a/dev-ruby/flog/flog-4.6.4.ebuild
+++ b/dev-ruby/flog/flog-4.6.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
 
diff --git a/dev-ruby/gist/Manifest b/dev-ruby/gist/Manifest
index c670d1a47aab..222b9fa783f6 100644
--- a/dev-ruby/gist/Manifest
+++ b/dev-ruby/gist/Manifest
@@ -1,5 +1,3 @@
-DIST gist-5.1.0.gem 45568 BLAKE2B 829a307fb2f03afaa4b4ef8308e8afc03a1218d91f7ad1d104c5988e928d684a9fe8a54572b83d05ccc9aae5186ece7ab7ac5f8b43b0b0ebaa50f8706f22a90c SHA512 4684885142065929fce87a335749d5d5eac0486a3f340005409d178831b5ea616f8e8f34b2e43f1afd6e392cf91883bcfc4b2ca26183aea711420563b22aeccd
 DIST gist-6.0.0.gem 28160 BLAKE2B c231eb3a165fabaac104f5a3e2e10668f15ec8fdde4a5b7a925e35372854f44f0cbbe72f67f6777d42402a1b1d028c5c96d254f0860ff1cde78d39b1d15ba898 SHA512 ba1fb6636a2312c6cf598d2bdb181e354c19496266a65e097e0d27db8702c08ab5fab7744cc2a6911578ae1df0bbacb5c1e2712b18d090dedb69458ce6817cec
-EBUILD gist-5.1.0.ebuild 515 BLAKE2B 01d02f522856051b926c43d913492ec2539b3a95b48677c8b22b9fe328a684a6f732d81effd6ed46c8c7bead23dd50b6ac29d256d256d4cf77130804fcdf1251 SHA512 13c788ac3aeab8c44ce253d8c6cdf13b91ec5cbf6ffa4682266a14fdc8795733892be4eefa43e23055a2871fc2d8427308b6d3c0ffadf21e8bfa2a459b276af4
 EBUILD gist-6.0.0.ebuild 483 BLAKE2B 47e964be829c30b9c1c3ba75454b3ac85ee7bf657c3abf1615429e75ea103f085ef81ef1de7da9939c8709c198b5dafbab8df90835ef3ee6351ddaac0276307b SHA512 fdf79a7e2a16b1dfc42d3f6c16453c6d5d47b8942783b86cc0e56515736bd3adcbaef6d959f3e601ada249856406762e09845ad90a7c215231cd3e24015bfbc3
 MISC metadata.xml 439 BLAKE2B 05117be30c76742036f51144ba7a97d10894dd820b5bcaadb22930534d294799b440009404d6911556d455c57742568d4a9c0bfff18e2ed9a4879b2ed091de45 SHA512 9b6d72a535ee7dd8c38743dafb7356899c3c0666cec7aee6cc53522187222a2f955292b5438577ec6bc690501e570f31c70b9f67c0364c0e3f55b10954656bf2
diff --git a/dev-ruby/gist/gist-5.1.0.ebuild b/dev-ruby/gist/gist-5.1.0.ebuild
deleted file mode 100644
index 281d969d8c4d..000000000000
--- a/dev-ruby/gist/gist-5.1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Potentially the best command line gister."
-HOMEPAGE="https://github.com/defunkt/gist"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-# dev-python/txgithub also installs a 'gist' binary.
-RDEPEND="!dev-python/txgithub"
-
-ruby_add_bdepend "test? ( dev-ruby/webmock )"
diff --git a/dev-ruby/globalid/Manifest b/dev-ruby/globalid/Manifest
index 3c6ed4601ab8..4c5d61c90a9c 100644
--- a/dev-ruby/globalid/Manifest
+++ b/dev-ruby/globalid/Manifest
@@ -1,6 +1,4 @@
 AUX globalid-0.4.2-integer-time.patch 778 BLAKE2B 5414dffd32180cc6306f26076583d804ed4c26bde10c941944647e859383516ba2cfc5f68175ad11bb97fc9098e71cd20b8dcf462c22337abd49a97bfbc6923f SHA512 2c7cbbfc3c1a8740721f85647d504d947bf9911897429ae2b006c983dc39c03bb02a11ec2e695b8c4f5157c1d78aa8a96f3800b717e37e3c2871340560170ed6
 DIST globalid-0.4.2.tar.gz 18669 BLAKE2B 7773362a16f5e3d0fec2a45e9bc768b5f22072d148bc77289c6841f24e4187f88b34bb9134f3ac086390bea5664d4cfa4281d96b0b8a3750e09e461350a0a50a SHA512 2f101601e36fdb6ba912652bbcc78a0561e0233c58d481dacbddd250ed39a1fa68a9b9c1cdadbdc708ac3147f64475fd6b68562d1ebab376fd2a517c93a23e49
-EBUILD globalid-0.4.2-r1.ebuild 771 BLAKE2B 1cbb9c4519c92b261ac79a4724e0486673d1d8612be7fa99ddd9ae3433e1efc6d42f9bf3bc4bc7cc52b14417222ef57d9576aef66ba627e92ed6cb0a40bdca0c SHA512 811b75c6fe582e7bd0dae989064370e53c871809ac6b2560f3ca0911854044d7b629a5fe24354003fbddb2b4ef12ac5aedc1aef0ece4b6feb267f084901b7568
 EBUILD globalid-0.4.2-r2.ebuild 828 BLAKE2B 1f2fb67010d33eab7831a911f7a7cbd95a056ceb214b6741c38cfa6932ab2fc4513735990c29edab19392b454fe2af9292c3f872204059d3d6c6c95d3cf0feb8 SHA512 1a38d7cf266efdd9938fcf0b739fbd67bc4bab4586fa2411a1db7d07e7f622d19ea7bc264a422f26b5cd3726a14a5861362b9e05afe4c174cd81b3b06d175c7b
-EBUILD globalid-0.4.2.ebuild 774 BLAKE2B 7141669a7747eaa4b73074a8a6bba1154ed997c8691bae1dcc33dbd6fcebad74baf98861884abd9d76a6819e806fe5907e245eeb0d6d89cc6ad5aa4d520b0827 SHA512 87db6271ebb3ff86096dca8a0b650c981261d05cd0c79fb4f06c74f509ce82f3c53d13b836877575361a79074d51bd81de81ee483aadf8692b186f72240ac582
 MISC metadata.xml 340 BLAKE2B c8aa9febd2a1238630c8d42d1670d1333a9c9b8ad8a1195bc49518b4b90e0c5238e8d3859a71a304629c8931b7fa286f805b4eabd1b0782263c689888d168546 SHA512 31207f04b56e2be06ebe5367d496e8f7e9c73732cd0fa852d19bb49cfdb7b53ff30d23131a53ec9a9ca8c7aee8f8d0b4d74cd896c7e407a8b6aead17f06e106e
diff --git a/dev-ruby/globalid/globalid-0.4.2-r1.ebuild b/dev-ruby/globalid/globalid-0.4.2-r1.ebuild
deleted file mode 100644
index 4ecccd164ba0..000000000000
--- a/dev-ruby/globalid/globalid-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="globalid.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
-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/globalid/globalid-0.4.2.ebuild b/dev-ruby/globalid/globalid-0.4.2.ebuild
deleted file mode 100644
index 72e08acc7fb9..000000000000
--- a/dev-ruby/globalid/globalid-0.4.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Reference models by URI"
-HOMEPAGE="https://github.com/rails/globalid"
-SRC_URI="https://github.com/rails/globalid/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/activemodel-4.2.0 >=dev-ruby/railties-4.2.0 )"
-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/gruff/Manifest b/dev-ruby/gruff/Manifest
index 428fcf42b5a2..9519943381e7 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,11 +1,5 @@
-DIST gruff-0.12.1.tar.gz 27157241 BLAKE2B 18e0fc5398c16bc6eea9e628b4be887e9bd9e260e23476fbf7115a0db952ec036d36e5d28edf1b0dd121bf6193cc01fd00d629ba88da33b796db5618e3d401ab SHA512 553419952279cb26043d394286de26b0b63a57495a51e595d344cf8613bbf08b6838fd07d77e8c9272a1f3cb45042f88b9d3500ebbb6acca2bae8c6ded12b3bb
-DIST gruff-0.12.2.tar.gz 27157493 BLAKE2B 230e6c70226e3754719f8ca059ba6cfa68909b98b63d7a4ac753f7c6d5993117e3aeae2703565c8202c75863f142c3caa1d52e65fbcb8f26f173ac4f95e5ecd4 SHA512 a278066eb9e22dc1c30b3b607fac78e0f232a1c086412d895a648f640aaea5812b4783ff9f2fbe96e3200ceef7b58362571dd857da75266f124f415ca5527d9e
 DIST gruff-0.13.0.tar.gz 20027648 BLAKE2B 53a21a99df834d68ba3100111bb7141bc8aa4fd861e5ca2bd963882fc15c1778315b63297ce12ecef19548791c2d573254eb8e38fd47b55092889f82646a9ed4 SHA512 6c2e1c484c081f67797a073d33e4774f484d2e2c27f9cced2ebccb377e806669470f2be23070b9d151a8a5cb1af01ea92dbfcefa5f79bc269a18f6523807b1da
 DIST gruff-0.7.0.gem 318464 BLAKE2B bcc51f524089f53b89778143b444c70d4e168983edda247cdb4c9c84c288450154ce6e5234bbf7a0a8ae7251df611333c8bb411a8fd3765ccc5fe9650c3efc38 SHA512 b9842213ab3da7b4eccf8bd06e18d62aea14a6a15d7c45ebe7e51a76acd456ce140f094a9419d4c0bd1774e7d203bea49f9c39aca36c75d744f2732bcde9f688
-DIST gruff-0.8.0.tar.gz 24712264 BLAKE2B 836ea41e8c7a91ec09ef5356e4f021f99381be4ba437bd043ac628a31ad02f1846cfcf182c2ee038ff90918386413cc9d213d9958412c2bd0c89b1ee2d5c481d SHA512 867fdf50c41bf0e1040ef954c00bced11df0c3d382333aef42f6325a30a950f2ab04e0a5beedf1ab5c3cb23d1682b56d2a398d8afc8d7aa665980ddac4e6cdcb
-EBUILD gruff-0.12.1.ebuild 1593 BLAKE2B e26f323d958c2cb9c1a977ced3887ffb920535de99571a73ecb423b9a53800cfbc6a4895b87fa272e487098759b75af6f72c5bbb5c69b04a303b9be997a40440 SHA512 ea15cc517500e6814bd171bfd7ded6ef23c50c5a9214a9b2e544e99eff79def8bb67147053c179c02e2905a337cf471817f15c794bb63c7a35e9ee8e435d7a78
-EBUILD gruff-0.12.2.ebuild 1593 BLAKE2B e26f323d958c2cb9c1a977ced3887ffb920535de99571a73ecb423b9a53800cfbc6a4895b87fa272e487098759b75af6f72c5bbb5c69b04a303b9be997a40440 SHA512 ea15cc517500e6814bd171bfd7ded6ef23c50c5a9214a9b2e544e99eff79def8bb67147053c179c02e2905a337cf471817f15c794bb63c7a35e9ee8e435d7a78
 EBUILD gruff-0.13.0.ebuild 1608 BLAKE2B 500779630786842908dca5c04da966577ae3894636fbb61d65269ae84e80b63caf338e17b16a856404aa66f1fff0ec9a914c89464c0c879d3753c774f13409ed SHA512 db58b519acdc8e9d51b19b25de60e3fc72f4e8318543a4deef6e07471701687d4c8da6c3924abd7694096fce62dd2042816bc5bdbb502e55b81a8531ac3db73d
 EBUILD gruff-0.7.0-r2.ebuild 1448 BLAKE2B a177b6d58f8fb977308f86fa0372919d90cbff9be96d1a1ffcb362c1faad11aa0d423d7894ed8aab312bdd22f6dac58506401de873ffa18de704111fdb08092e SHA512 4790cde6289b55df95aa2ea410c7aff604b45b5056d1251c130e87939d0a06f6ba2c15c808c1920246fd5af6af5559a903e569a12c5858a2476bb155aafbfee6
-EBUILD gruff-0.8.0.ebuild 1416 BLAKE2B e77119bba425b5ecc75e1adf342f10e41487fb012a94fca1e8bab5bfce2d55f682756cb9acceccf3e04ca4941ceb096ec298777d9bfa12437ad4047d8a160bec SHA512 97c2e62b99ce63e11355fa7e94f530d909b31342360b91a93ac4c8d8ec01b57607535b404c8b1781608bcf46b958c43119bfc2974b6edc6f6ba299e941725748
 MISC metadata.xml 340 BLAKE2B e3adfc25e09939c98ba4a4323afd0babccd4b0c11ea712e93a454ea4d3074f12a895d674735f8209598336a1d62ea61d6d00c8956a47cccd583857c36f261ab7 SHA512 1136e2805ed73f18bba2c981e2788fa635face71a9b1b384e3dc20680afd4fb354f33ac099077568f7fa1f3510e1c46771f663341153ae64ef961508243c16d6
diff --git a/dev-ruby/gruff/gruff-0.12.1.ebuild b/dev-ruby/gruff/gruff-0.12.1.ebuild
deleted file mode 100644
index 93d003f39581..000000000000
--- a/dev-ruby/gruff/gruff-0.12.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend "dev-ruby/histogram dev-ruby/rmagick:*"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/reporters/I s:^:#:' test/gruff_test_case.rb || die
-	sed -i -e '2irequire "date"' test/test_scatter.rb || die
-
-	sed -e 's/git ls-files/find . -print/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	# Skip the image comparison checks since the images are not
-	# pixel-perfect identical, most likely due to the use of a slightly
-	# different font.
-	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/gruff/gruff-0.12.2.ebuild b/dev-ruby/gruff/gruff-0.12.2.ebuild
deleted file mode 100644
index 93d003f39581..000000000000
--- a/dev-ruby/gruff/gruff-0.12.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend "dev-ruby/histogram dev-ruby/rmagick:*"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/reporters/I s:^:#:' test/gruff_test_case.rb || die
-	sed -i -e '2irequire "date"' test/test_scatter.rb || die
-
-	sed -e 's/git ls-files/find . -print/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	# Skip the image comparison checks since the images are not
-	# pixel-perfect identical, most likely due to the use of a slightly
-	# different font.
-	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/gruff/gruff-0.8.0.ebuild b/dev-ruby/gruff/gruff-0.8.0.ebuild
deleted file mode 100644
index 08f719941e4b..000000000000
--- a/dev-ruby/gruff/gruff-0.8.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
-
-RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Beautiful graphs for one or multiple datasets"
-HOMEPAGE="https://github.com/topfunky/gruff"
-SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# imagemagick is an indirect dependency through rmagick. However, for
-# gruff to work properly imagemagick needs to be compiled with truetype
-# support and this cannot be expressed in the rmagick dependency. Tests
-# also require imagemagick to have jpeg and png support.
-DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
-RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
-
-ruby_add_rdepend "dev-ruby/rmagick:*"
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/reporters/I s:^:#:' test/gruff_test_case.rb || die
-	sed -i -e '2irequire "date"' test/test_scatter.rb || die
-
-	sed -e 's/git ls-files/find . -print/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/haml-rails/Manifest b/dev-ruby/haml-rails/Manifest
index 1abee1c1ee8f..3035dec3a712 100644
--- a/dev-ruby/haml-rails/Manifest
+++ b/dev-ruby/haml-rails/Manifest
@@ -1,5 +1,3 @@
-DIST haml-rails-2.0.0.gem 13824 BLAKE2B 4d885be047f972cea11d3c7d0a9e56d557763d5bf3e95e7cefab33a4422ad114f6351db3226cd1d7645082d70f03a9ecbf86d6ef089ac0ab8836b74736d7ecc8 SHA512 47c5adfeb7b24ccf83ada7c2b453696f3544bc2ed4e7de3ae8ab52a64f6b5f3a3cef36f3144600c47b2f647ec42fd40d32651c7cd1b90184b767f81ec33ac855
 DIST haml-rails-2.0.1.gem 13824 BLAKE2B 24fded0f576d92083a10737954e1a32eb8e5f6a8db11fabc55ac0de3b17377419606d44f5b2e202e0733d9f538166172a6b5f7e08ee7efd71ddf7d3e7f6c9107 SHA512 7ccf9d618ca7b7c1681a063c51cf9dae9ce5e245479e3e7ba87a170ee1ba3eb35ff59061195928792f19f7e33a12ae7de3d5a36d35958e2a1761a12dc51b26d0
-EBUILD haml-rails-2.0.0.ebuild 688 BLAKE2B fd58aebcbc7818b4d3d9789372fdcfd5502b6d6790c30cd83df11ec5fffb54f54566c6ec57fc460f7f6738d07ad9e75658b24bb0a562badf9da5894bd6e17d60 SHA512 8319af2f3775cb135f55eb409f2892f3ea542d54b7ee8d15a232acd32288b23ca0a4d3b8a803c2c9ba0877825c0a58414030e38be1f59e11780e7894e9bb3ac2
-EBUILD haml-rails-2.0.1.ebuild 681 BLAKE2B 829119916d34445f23d8bbe4e733fc5df8a332a06fe4135f7a9b83b6a7f072eff733961888d5f60030472ef6114d43207b1e6a312e0c5b258d519b05096147c9 SHA512 826133a2a3b2260afa46b7074b644c92b6dcca1f7ce89803066d85617c6fb87b7ad8841a78555e885cfdee548f635595da6d5f5e8b60ba1bab347199b98fcb81
+EBUILD haml-rails-2.0.1.ebuild 681 BLAKE2B 2effc55154632fd9be2afcb0d92be42c772a3d1c9c9a574e2ecf312405116dbb1acc2bef9a57937bea0dccb097b2428faa990b0bc3eb9d0f502379b790f7f4ad SHA512 d9687bdcd397013b7c7bbf5ddb045a1c6c9932792287f74bdb19b3cfa6fb08fc6d96b7aac5941543da48d538b87a8813c8b2b24f4ebd1ab4cda373ca8a55dad9
 MISC metadata.xml 335 BLAKE2B 00c2a8da3d6d0f138c7c674b28ff25404140e7e2c2413f029c8ec9aff5daa2f3eb5517b18679ff708d868402dfa0373ec855cc4c664f50978ec85269725767a6 SHA512 651f5728561bbd3edd474192b38fd753ff25def147e269eef89c4c25ba94ce9b7837806600ddbff28185fc71a45b28205fc2f5fd4d7dfdd37e4f3d92c3d6d05c
diff --git a/dev-ruby/haml-rails/haml-rails-2.0.0.ebuild b/dev-ruby/haml-rails/haml-rails-2.0.0.ebuild
deleted file mode 100644
index 3cf22ec4b4af..000000000000
--- a/dev-ruby/haml-rails/haml-rails-2.0.0.ebuild
+++ /dev/null
@@ -1,30 +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_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides Haml generators for Rails 4"
-HOMEPAGE="https://github.com/indirect/haml-rails"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/actionpack-5.1:*
-	>=dev-ruby/activesupport-5.1:*
-	>=dev-ruby/railties-5.1:*
-	>=dev-ruby/haml-4.0.6:* <dev-ruby/haml-6:*
-	>=dev-ruby/html2haml-1.0.1"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rails-5.1 )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild b/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
index 3cfe4a30206c..1d5e15988629 100644
--- a/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
+++ b/dev-ruby/haml-rails/haml-rails-2.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index 7cb78a24992b..7df5eb98652c 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,10 +1,7 @@
 DIST hashie-2.1.2.gem 34816 BLAKE2B 7406fece6c731f62ab8b73095b6c61d4d79cc3811ba20db68d2d6c54a780e8b37ce92ffa97ddc6c9ae2b802fbdbb04cc0d9c752761c9032739f3548f05696757 SHA512 6f72998710da58a2584939b4e74a114ae54168902020dc16ec5ea0422a91316b84aa6835fffb36a2985634f24ff5b0d01bcdb50134a414a269a4881ebcd728ac
 DIST hashie-3.6.0.gem 74752 BLAKE2B b689843d30001dd7eaa09d62ab908d60e76128df66055283ccf0770830e5901b4e792c4bebd2cad8bb6d5e97a23016aee0d0114f2fb0f7ace8ebd722b8941020 SHA512 7b5355a2b93267d6b7c63608aeac4bb7d21f32a982e2c59771d5a791f9a0c921d11e1b4a185067447917315ce98f8cc5f2b48a31efec3068fb1f1ec0e4386e15
-DIST hashie-4.0.0.tar.gz 82096 BLAKE2B d2fa4f208e4bb08a15c7c14208fef368ea5653e556045378ead94b7002250a798637fede4f8438238111946a4393794828f88d19b7f8c733500d745a361049cf SHA512 b26b80a0b981fa534d17b20a7a2dfad82487950f94bf38d62129aa7af4de7875e1fd9519fae30c13d16a92e041033fe6f80978fd30014a571503650ee73ca549
 DIST hashie-4.1.0.tar.gz 86972 BLAKE2B 33979037db67f8a7f20ae85e3db6e8b5415b9b2659a5961e2c2a97e3197fef1500cedd8557af314baf8395a9790e8a457633ecade944c198c295f7f13847afa5 SHA512 f2a36ee812e39d679390647514ff894d4170b61ece6d37ef42f1203212d80d2dee63b4af162d81ded451a53c058746f26fc16810db4c748cce9ca6635a300a4b
 EBUILD hashie-2.1.2-r1.ebuild 736 BLAKE2B d54f1f1d5cf059d17af6bbd20c229cb8cf28cc2cd2a62a4ee6e42200f76c16393e0b1f2927fec47c485a5e144211dd8ed9ee790c73dee30fa93ab865b79bb084 SHA512 650393587f133232d8bc304fd1783d19c8eb6f9baab5e5efb3b3619b957f69dab9b46c90d8c7622519a2b3ba3e06c4496c2074079dedad14a768a36789acc1fb
-EBUILD hashie-3.6.0.ebuild 1275 BLAKE2B e2538ece27eef72965fefcb90a7ff9100fbd891c8b91d2e643179cbf2f6bab6d5ed6260875541009f78ae81e814226c4d61e3b1aca2772da84453bb76b9fba46 SHA512 358dbcbe31730582578ed9f7f2cb852577f7605440b564714b672d934d6ee904abef3c325fbbb20f55119b29fe8da3e130c0a3f9b1cafe5a50e80b8b93789f28
-EBUILD hashie-4.0.0.ebuild 1400 BLAKE2B 0fd64036760e158fc0d67750a1dd94010bca727e454fa6b585e3644e6949db5d897b1a1bc97a65f9648413dfab122bedb155d429588737100b15d66cbf9b5158 SHA512 8238a45c6eb083ee594460b81cc5e5d0df5c883dfdfacb761d104b7708a01cf4ec5a2f8c49d7aaed46c235cd4350a8ed88bd79170f1bce22818901b2ae5cd014
+EBUILD hashie-3.6.0.ebuild 1268 BLAKE2B 04e697da97b799f233c554d8ad87975c615117016a1b2a9c04a0fc0863cce12e7c4c2de50699c94ca722c354ebc400f70d5fad5591ce56b2ae3b842a5c6d2fc0 SHA512 b9e49a49083f9f38fda4dd89739fb26c0abf5a99bd8e17b077a970b5827bda62c071e4341bc19ed76d2f8dd9c57ea9c94727f98da09f95706829e679c85215c7
 EBUILD hashie-4.1.0-r1.ebuild 1423 BLAKE2B dc4f910fd0a74a62606a3be071b96ab0b24c9bf960f69c33b61be779f47dd5c8fc3b9d73758ebe6f670f280029e07b91a5cc54cfd7f242650bd5dcc1eb7a76b3 SHA512 1cbf44f2fe3560c74bcf83ea74432fc3a8d2175662ce008acaf66a810eb79ee3c9b6812c705d0c7e775357b52b5fc911fabe54003227a0417d1045205750f14c
-EBUILD hashie-4.1.0.ebuild 1416 BLAKE2B 733864ac0a789d00a5765d5a343c799d590590540391a23fb00bf4da86c03c8f3ed5ac948d59594a7e988f71fac3e4a7762defeabd7ba161b35f383529aa2bdd SHA512 6d592c81cc03b77a7bd7203ed2b86bfd66a853c506935775c015c0905ec8e144955c8142db0f39d5a23d92116cca2f4c63db75ecc5bbad8aa243209e4287aab3
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hashie/hashie-3.6.0.ebuild b/dev-ruby/hashie/hashie-3.6.0.ebuild
index 2e718a17eb12..3225a15fd058 100644
--- a/dev-ruby/hashie/hashie-3.6.0.ebuild
+++ b/dev-ruby/hashie/hashie-3.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/hashie/hashie-4.0.0.ebuild b/dev-ruby/hashie/hashie-4.0.0.ebuild
deleted file mode 100644
index a8504eb97b28..000000000000
--- a/dev-ruby/hashie/hashie-4.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="hashie.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
-HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
-SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	# Remove bundler and fix one spec that depends on its requires
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -e '/pry/ s:^:#:' \
-		-e '1irequire "pathname"; require "tempfile"' -i spec/spec_helper.rb || die
-
-	# Avoid dependency on rspec-pending_for and its dependencies
-	sed -i -e '/pending_for/ s:^:#:' \
-		spec/spec_helper.rb \
-		spec/hashie/mash_spec.rb \
-		spec/hashie/extensions/strict_key_access_spec.rb || die
-
-	# Avoid integration specs to avoid complicated dependencies
-	rm spec/integration/{elasticsearch,omniauth*,rails}/integration_spec.rb || die
-}
diff --git a/dev-ruby/hashie/hashie-4.1.0.ebuild b/dev-ruby/hashie/hashie-4.1.0.ebuild
deleted file mode 100644
index c434f9247e03..000000000000
--- a/dev-ruby/hashie/hashie-4.1.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="hashie.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
-HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
-SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	# Remove bundler and fix one spec that depends on its requires
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -e '/pry/ s:^:#:' \
-		-e '1irequire "pathname"; require "tempfile"; require "json"' -i spec/spec_helper.rb || die
-
-	# Avoid dependency on rspec-pending_for and its dependencies
-	sed -i -e '/pending_for/ s:^:#:' \
-		spec/spec_helper.rb \
-		spec/hashie/mash_spec.rb \
-		spec/hashie/extensions/strict_key_access_spec.rb || die
-
-	# Avoid integration specs to avoid complicated dependencies
-	rm spec/integration/{elasticsearch,omniauth*,rails}/integration_spec.rb || die
-}
diff --git a/dev-ruby/hiera-eyaml-gpg/Manifest b/dev-ruby/hiera-eyaml-gpg/Manifest
index baebe799b4f8..4acd3b1bcbc5 100644
--- a/dev-ruby/hiera-eyaml-gpg/Manifest
+++ b/dev-ruby/hiera-eyaml-gpg/Manifest
@@ -1,3 +1,3 @@
 DIST hiera-eyaml-gpg-0.7.4.gem 14848 BLAKE2B 68d6fb4047dcc80ceca5350459a60c42f7d3db753491b94c4710920ddd484eaf0bee76f3381a2fa663795baec58e6d26614782f7f1a88933152cce8cc284457c SHA512 5cee22e435f7bcc1e4a9d4775ecdf0eb9cd70cf3e26870107920993df480082f7bebd7d488b060880407a7debd11c7b9a202f8f3a99da811ae8f49f17a7495e6
-EBUILD hiera-eyaml-gpg-0.7.4.ebuild 483 BLAKE2B ce8f86d4aa424c4719fb327e1809c0ea06f4b64a345825f6909c8264379292fce084692a9c6e7ff0fd9415e234a5440eb01730bf6b927f2988095bd2bd216e37 SHA512 7be902b7d8015b90ea62a96c6ade8928031f120bbd0a6d5456e204b49603ce4331ce6b3f6aab44861016c5c4584e4b3a6bd4e4d6d02ae86c7f1d990ffd01ca48
+EBUILD hiera-eyaml-gpg-0.7.4.ebuild 483 BLAKE2B ca8068f6df7cc3e99f8958e58e4bd35cc201da4a9c43c21068daa9a48145b1ee9e5351daab2f07a485fafa7df120a6caa8c8f9df8375d48971f9b1d2a9941e66 SHA512 14a20196ee591b8c3c4653be1a36810911f6465f3085f27461c0a536cd2b12198664d0987ae8873951749affcf96037a3fd520bfc3095d891e1d8ecd89fda99c
 MISC metadata.xml 473 BLAKE2B 076b7ca0bd642db56643c593070270ec77bccfed2f6ca545571e291c5faa7ddbf437c7216c3d115e8c646e41ff2914db4e7e9c6af0fae792cac38136caf04fc9 SHA512 5c9d09cc98b71839551598112cedf87d6adbd9311f126400527c61a8827c708d69a62bf84d4e269373729426740aca87060f7ef3467a0d3b5fef60920e811a21
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild
index 2564ba5530ea..ee20f39cf7d0 100644
--- a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild
+++ b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/hipchat/Manifest b/dev-ruby/hipchat/Manifest
index ac5db73883d0..91da90b7367f 100644
--- a/dev-ruby/hipchat/Manifest
+++ b/dev-ruby/hipchat/Manifest
@@ -1,3 +1,3 @@
 DIST hipchat-1.6.0.tar.gz 23328 BLAKE2B b9328e339f40ff1d865af5bbd660d479e94e18be98a74171125ff9d55e96353bf0ad9420e9eacc8b1a650f873d16a197418f7cc8728042fd403a7d1bceaa0b9a SHA512 43afbc2aca234d7d3778189874013df7847f9045ecc1d5ebd6b3772dce2a9cc5000fa6075867a9b0968d49410d775f3f56ed0a4ae637d6ad3893aa668895f2a3
-EBUILD hipchat-1.6.0.ebuild 893 BLAKE2B 167b18698866208d317aef86ef385b3fc4c720a3be7e130c9c76226b3cf1384990753a293862a791c4fe29ca1876c3d3868bbf03218359bd7caa5f673871aa32 SHA512 2cc6721d21b484b716d628eccccefd21765c93da23e60472295c8116be7caa3c27eb173474d1813a5dd8db6f17584e647fa9bc4f4fc257e680060e866a1a3652
+EBUILD hipchat-1.6.0.ebuild 886 BLAKE2B 21ae86ad89e1740caaf962f75a9beed976844ac7962bd00c808b30b01b8a4e0d02e0979827d0510376c519df948b3213990367a97ea11dd3b15d729c81d862f0 SHA512 e0c5ae64a4361ee57fc83a10dfb39cc948482db236bb2dacc5fa0ce33e848a42dce3df0511f915c6eddfaf785fc825a2033a0a4b93d7e33ddf03f364dd182248
 MISC metadata.xml 344 BLAKE2B 6e939739b4e25c1e6f3d7a01404d63c56d68744c089158d093211394410cbb2d13a0f7802f5378659888ceb0cc0b466accbf28f75f3fe54e9c1d759eadf21dff SHA512 3d3dba56d79d454c346c2616045e6d134d668b94bdbc1c056ccba1b13a2ab715d781904074d42bbb0506d9d1af2cd61d7df08613c077204c558c83b3f31ae3b9
diff --git a/dev-ruby/hipchat/hipchat-1.6.0.ebuild b/dev-ruby/hipchat/hipchat-1.6.0.ebuild
index 0a4ab80daf6d..ab1c1172bf14 100644
--- a/dev-ruby/hipchat/hipchat-1.6.0.ebuild
+++ b/dev-ruby/hipchat/hipchat-1.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/html2haml/Manifest b/dev-ruby/html2haml/Manifest
index f7ad16a4ea2a..078847705fcf 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 753 BLAKE2B d81924347b5b250e61f51ae4e8883266cd7d48821e72d9a2909b7c79ceec353aeb82ee4c2fb8a2f7f761da483466f29204ad0a38765ce02e68c8b5e05afd2167 SHA512 efca3fe8d36660b7ff7e03b7dd004f1ec817405fb81d0f962909c12ce9c3c115676820bd53c4334cfd7b77d8fcd21fff89abb618e62f879f3ed89398d038964d
+EBUILD html2haml-2.2.0.ebuild 753 BLAKE2B 7c9b71113afb18b19e61f951fbd3c3e769ca456ed19366c63c61aa2d9b6581331b7fe08b8dd6ecdc3893be78069ac0e7ae53239a21c4339d4cd58052befe911d SHA512 584b0527f70b18ac66c28f80ea1654cef30e3f4cfae3e91c0dacfd5c667ed886fdebf7074a02b5347e96ea895b834cc2dccc2ec4f14534509ba079ce2c238cb4
 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 3dac0ad3ef2d..6151f4cbc90b 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-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md Changelog.markdown"
 RUBY_FAKEGEM_RECIPE_DOC="yard"
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index a78e4165bd05..479619c3c97c 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1,5 +1,5 @@
 DIST httparty-0.17.3.tar.gz 97444 BLAKE2B 773e40fc35ca44cd3b14a30e7a7ea5783c0c158cdb8488b34ffa36af5a572d5f6eef697cab147c5be1448906c35071284947ba598409be35af54a20846f4d98c SHA512 c06aa4456c692e2a32f8e44b2316d46f664c4e2c8efb370607796f6801d96e989a54e61bdf125cff679b8c5f5abb1557b87aef48d8f3a392c1942ac4821db84d
 DIST httparty-0.18.1.tar.gz 97813 BLAKE2B 3192ad5f1e8c292456710529f4e1595ea5b70ae4ad61695d6d0b036872d40b2afbc0c958ffb25b0c1222ba8004593d20c4d3954c530d6c836e915b87150d954a SHA512 fca9de534199fbf6a058c39c3ebe28587c34df2bffee313a0e05204258fb6b6b6643bd0a28deca9d0b42de21c90c54dab058124349e4774489578fb23e8bacf5
 EBUILD httparty-0.17.3.ebuild 1652 BLAKE2B f22b76a26c3f2239daa9f7e9fc83ea04bb38bb2585b32136e3838883af771e01f8b3cce075883e3f361d0596a1b3a12aee5d99eec92cbd5a641f85acad34f33d SHA512 cdd87ab32eb7ddd4ee31671b18278b7d686d9375e666b10e71f5c036d1bddc9b36b55341937c1ade07098663f5ce64d705d4e67faec39c8c18d3a349485a609b
-EBUILD httparty-0.18.1.ebuild 1844 BLAKE2B c87bfaf634693c705a7764045dd3345bcdc60752a011ead976b1a6b97abfc4eb1549746716a040fd0d8f783f6ad43b999a893128bbcdf700da088b5c13f4b1da SHA512 f5a53e3fa6f43a9b430916da69469e8a14de0583840a61ce91af6e9681d8278ebefa1f42a2e981f6954cf7a12c5bb631f72fbdb7299ee6b71f77490a3dbf7f55
+EBUILD httparty-0.18.1.ebuild 1843 BLAKE2B aa21a61e27231d4b4326463aa0b996947e0d711b40a83b9de78b6920f60a0c4bf397e2f54b7ecf87f0ffbb2e9a021e4ee15eaff259bcd421aa2372870e156d0a SHA512 732404c9aa489e7cc6da4991141ce927ca8ca2f227eeaa1e0343d79051670e235a0309d1fdd15b4d290d68feb995e6576c4ff53ebca126f724ad37dfacace0a0
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/httparty/httparty-0.18.1.ebuild b/dev-ruby/httparty/httparty-0.18.1.ebuild
index 0ce0a25a8724..a4fb9eb7a56d 100644
--- a/dev-ruby/httparty/httparty-0.18.1.ebuild
+++ b/dev-ruby/httparty/httparty-0.18.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/jnunemaker/httparty/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 ruby_add_rdepend 'dev-ruby/mime-types:3 >=dev-ruby/multi_xml-0.5.2'
diff --git a/dev-ruby/image_processing/Manifest b/dev-ruby/image_processing/Manifest
index 3854f55a5d0f..d2e07f067cdb 100644
--- a/dev-ruby/image_processing/Manifest
+++ b/dev-ruby/image_processing/Manifest
@@ -1,9 +1,3 @@
-DIST image_processing-1.10.3.tar.gz 985090 BLAKE2B 9626dd41ae97cd0c68b857ccce2dd2b5eebbc04a5a3fc145cfde681b8ba9cc78806ddf1e7542afa2799ad707ced592149304216875297fc1bac112501dfcdbbb SHA512 7883199b2ccd693ae91a5d028a7c7bf5834cb36c7a48b4d02d1d92d7681e382a4e6605ca80cb0ca2f9949bfa95d8dafac3057e2508bb2932c5c3c0c3dee99b12
-DIST image_processing-1.11.0.tar.gz 985565 BLAKE2B 2ab1cfcdb0637dfbba50558cdb0b778cbb2f7bccf2a12aff5515171e252b0f41624d1867a2cb825d7200b5c09eb57d4f002cd086fdb987a9513a2ef3401a2db3 SHA512 2978ab351f6afaa9bb4ff08be6f89a27a634ac49a239a88c59cd40c877ffe4da57bdfe0d02af31577be113f04d7dc736e891b1edebc09fd4829bbe89085c4282
-DIST image_processing-1.12.0.tar.gz 986331 BLAKE2B 765906d2cfcb63ef8257144bc54744d9a43f4673fb5d1f99d7230bee52534ebae1e6d39009203a1fa080e42889c55885e8e828be1d282d8d2de7358cf69ad2ca SHA512 b1bd8b8da8aedc348591c900dfc0f6a862acfb7f12f10640ce4db181b738a145efc8c1ce8d6f0863930fdd7989670e1114dc8d91581a22e7f9093cf6ae9ad61c
 DIST image_processing-1.12.1.tar.gz 986447 BLAKE2B cd3fa67c7f9890835d86fe669c5aa450fd91d1a898da3193da0e8d630bbe141867a2b9ac08f28886d167a9bd07128ea135c6300a265517d0155ccdda48a00b03 SHA512 c2f3f3db1c06a8730d98193276b12b9371735929b267054a7866fda032f5860474390b245bcb2017e60cc1b601a2f0f598fc8ebb358e6a98e25bac6fa4d96c7b
-EBUILD image_processing-1.10.3.ebuild 1253 BLAKE2B 248f68b3a1571a435b03fb742b43b1b431749676d39785a9bdc96444e5d77fa9a54b11d7dd23f6a538eb2172b9fe47706fb5a029c073175d375878933f59aacb SHA512 dffc1d21f2788bcd53afb71b8b776dff7766196b3b379e49c4aa3e1ec3852066ba5239c72f561c0064ba11916d061f51be0d7a235ea4bd18c1caada3d99e0cbf
-EBUILD image_processing-1.11.0.ebuild 1253 BLAKE2B 248f68b3a1571a435b03fb742b43b1b431749676d39785a9bdc96444e5d77fa9a54b11d7dd23f6a538eb2172b9fe47706fb5a029c073175d375878933f59aacb SHA512 dffc1d21f2788bcd53afb71b8b776dff7766196b3b379e49c4aa3e1ec3852066ba5239c72f561c0064ba11916d061f51be0d7a235ea4bd18c1caada3d99e0cbf
-EBUILD image_processing-1.12.0.ebuild 1258 BLAKE2B 27f9318f386cec54e81ee9ff490523b660e0db89f6fe3a58780668d54258bf57b18beb85fbd1025aa86d7206239ab1d332007e46513018625003e26efe3e75db SHA512 f556b8e5055262261cdd1ec35f472843d26c8fcebd2e5ebb7d2c1733e0b47da7a7ef2ff45517406c201929c83c5d6181db6527dac36a6b08c6b6352d2bf3cd98
 EBUILD image_processing-1.12.1.ebuild 1277 BLAKE2B 395d331d16ebc2b726b229cf1a39ea4cf1e0dd48b0c8b83ec18873f8e330cc34c5b77d08c26f4810687bf95735bdd83c9daff0ff2e3ac5aa2221aaad5441b97c SHA512 43293eb06b7215eccdb9c11b7a6573469362f22a02f6f11ed0110d07b10078f007eabaace7c3a03962f4eacbbed37d1025a746f18bce8e72e95b39cf5ce21c89
 MISC metadata.xml 348 BLAKE2B e9ff7002a69662a1f143cd31bf22379fa85f2548c0b1ca4b3e57e833d1f0090323b1e239f4ae53477effa8641a8435049a2835b2f054e90a06bfecd1c72ac536 SHA512 1fb1b17616eb7f7f083461e60823fecdbefeadfe1c3728a7e1ff381a453998164de3a0d64daf3714f079cbb456fba78acd9e09bafc73d2b562b75c5cf2064e96
diff --git a/dev-ruby/image_processing/image_processing-1.10.3.ebuild b/dev-ruby/image_processing/image_processing-1.10.3.ebuild
deleted file mode 100644
index 04f40b5f8a59..000000000000
--- a/dev-ruby/image_processing/image_processing-1.10.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md doc/*.md"
-
-RUBY_FAKEGEM_GEMSPEC="image_processing.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="High-level image processing helper methods with libvips and ImageMagick"
-HOMEPAGE="https://github.com/janko/image_processing"
-SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( media-gfx/imagemagick[jpeg,tiff] )"
-
-ruby_add_rdepend "
-	>=dev-ruby/mini_magick-4.9.5:0
-"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/minitest-5.8:5
-	>=dev-ruby/minitest-hooks-1.4.2
-	dev-ruby/minispec-metadata
-)"
-
-all_ruby_prepare() {
-	# Only support imagemagick for now since vips is not packaged
-	sed -i -e '/ruby-vips/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-	rm -f test/{pipeline,vips}_test.rb || die
-	sed -i -e '/assert_dimensions/ s:^:#:' test/*_test.rb || die
-
-	# phash is not packaged
-	sed -i -e '/\(assert\|refute\)_similar/ s:^:#:' test/*_test.rb || die
-
-	sed -i -e '/\(bundler\|phashion\|vips\)/ s:^:#:' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/image_processing/image_processing-1.11.0.ebuild b/dev-ruby/image_processing/image_processing-1.11.0.ebuild
deleted file mode 100644
index 04f40b5f8a59..000000000000
--- a/dev-ruby/image_processing/image_processing-1.11.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md doc/*.md"
-
-RUBY_FAKEGEM_GEMSPEC="image_processing.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="High-level image processing helper methods with libvips and ImageMagick"
-HOMEPAGE="https://github.com/janko/image_processing"
-SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( media-gfx/imagemagick[jpeg,tiff] )"
-
-ruby_add_rdepend "
-	>=dev-ruby/mini_magick-4.9.5:0
-"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/minitest-5.8:5
-	>=dev-ruby/minitest-hooks-1.4.2
-	dev-ruby/minispec-metadata
-)"
-
-all_ruby_prepare() {
-	# Only support imagemagick for now since vips is not packaged
-	sed -i -e '/ruby-vips/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-	rm -f test/{pipeline,vips}_test.rb || die
-	sed -i -e '/assert_dimensions/ s:^:#:' test/*_test.rb || die
-
-	# phash is not packaged
-	sed -i -e '/\(assert\|refute\)_similar/ s:^:#:' test/*_test.rb || die
-
-	sed -i -e '/\(bundler\|phashion\|vips\)/ s:^:#:' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/image_processing/image_processing-1.12.0.ebuild b/dev-ruby/image_processing/image_processing-1.12.0.ebuild
deleted file mode 100644
index b5cac1d48840..000000000000
--- a/dev-ruby/image_processing/image_processing-1.12.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md doc/*.md"
-
-RUBY_FAKEGEM_GEMSPEC="image_processing.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="High-level image processing helper methods with libvips and ImageMagick"
-HOMEPAGE="https://github.com/janko/image_processing"
-SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( media-gfx/imagemagick[jpeg,png,tiff] )"
-
-ruby_add_rdepend "
-	>=dev-ruby/mini_magick-4.9.5:0
-"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/minitest-5.8:5
-	>=dev-ruby/minitest-hooks-1.4.2
-	dev-ruby/minispec-metadata
-)"
-
-all_ruby_prepare() {
-	# Only support imagemagick for now since vips is not packaged
-	sed -i -e '/ruby-vips/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-	rm -f test/{builder,pipeline,vips}_test.rb || die
-	sed -i -e '/assert_dimensions/ s:^:#:' test/*_test.rb || die
-
-	# phash is not packaged
-	sed -i -e '/\(assert\|refute\)_similar/ s:^:#:' test/*_test.rb || die
-
-	sed -i -e '/\(bundler\|phashion\|vips\)/ s:^:#:' Rakefile test/test_helper.rb || die
-}
diff --git a/dev-ruby/liquid-c/Manifest b/dev-ruby/liquid-c/Manifest
index 843f10fec6dd..60298edd96c1 100644
--- a/dev-ruby/liquid-c/Manifest
+++ b/dev-ruby/liquid-c/Manifest
@@ -1,3 +1,4 @@
 DIST liquid-c-4.0.0.gem 15872 BLAKE2B 8083ae622da685db2aa557ffff0927a900a51c92227ea2523dcf4c408ff4df6f417cbf7fe019383220c3fe580d53f40d496787d8f7328a1e42c3f17a435eebe6 SHA512 a9f3618a7286c6417e9d22cad8c0716f84f33c43e9b12708711f9c4bdebb94a30e408b3dca99cdfe0a7c5b5e5b39ffa79e978ef6b44e5359975e3d74106932be
+EBUILD liquid-c-4.0.0-r1.ebuild 623 BLAKE2B 922e4803e0c8a5fffdebc21224850557fff29c0f7a1a6b350730a18be21de34c8e29e30c612c1d2962b1638d34050948cb3462ae0858d920a516dc57135d9397 SHA512 1ba9701e82ee75dd227757b94883fa0daa39cf6f6495c6bdffb6b8f5986c84569bb5a741ac4111f183f58ffd4b86fce170fb3204b54b2f416662c403401a3ef4
 EBUILD liquid-c-4.0.0.ebuild 779 BLAKE2B 3530d2fc60d4b5758e4c21b0ae65d8a2d1a9d49e291391d4ff5840c7839e53befdd9e137ab211083532af0d7dbe34d8de71175ba3fcf0fe4dfb7d68437861415 SHA512 f2d5f5266f82dfd5fd966261936b5ec8f91969c05d3c02852694ce41f644f9a453250004bb5a94e0d59712091ff08ea66b5eb45de9dd307ec77cd431069a09ea
 MISC metadata.xml 342 BLAKE2B af634d72b014424082fb52a22cf6ab3d792ec115c9ed1e4acdcd6988202bfce3256abf592c84ef7f795502f40be4fb0bf730ddc0900c703c7d5081290fe09a70 SHA512 443cd881ba1a56967dc7ebbb41fc28e14b33fe44ecc40aa5e5c38d1abb786b15913a07404faccdd41213205171e5caf16cd771478a414d7f3e52dc70c777a0a3
diff --git a/dev-ruby/liquid-c/liquid-c-4.0.0-r1.ebuild b/dev-ruby/liquid-c/liquid-c-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..544e5d002679
--- /dev/null
+++ b/dev-ruby/liquid-c/liquid-c-4.0.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+MY_PN=${PN/-/_}
+RUBY_FAKEGEM_EXTENSIONS=(ext/${MY_PN}/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Liquid performance extension in C"
+HOMEPAGE="https://github.com/Shopify/liquid-c"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/liquid-3.0.0:*"
+
+all_ruby_prepare() {
+	sed -i -e "s/-Werror//" ext/${MY_PN}/extconf.rb || die
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+}
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index aa56e7187bdc..8d966f1f170a 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -1,13 +1,7 @@
 DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610dd9deb3409c8ad270f7221d50e9eefee826c16c51ac0361cf7f5da727db216b1bd92a02077b0bee580fa368c SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0
 DIST listen-3.3.3.tar.gz 52994 BLAKE2B 95831a65a75cae28b767696bbe5969cd7115657fa56e01701f3b17d5bd727a053cbac16928d8c7c2a19ad24ea3c99afdadd1e9ebbae0a66d03a511ded7d32734 SHA512 73ad762086e7961e45f1245e5aa32c738824736b7d373c31565832c3acf25f91cbc9c25d7bdffb27cf953cb2b2bb37adfddcc6888f3a1b317f70cba75c2ce67c
-DIST listen-3.4.0.tar.gz 55390 BLAKE2B 44f0319a19cbac9535b585380c95a4c538a19f9b66a837ccb78ede4d2e8d2c49d0c78ff21913a8de959de43dfb62f4e5489ce70b06e0d5c47e19be81e42fa8dc SHA512 b247c6ec907141549943fd1eae4075c18efb653dbb666bd8b71876c4bd96ae637d4634746815ef1f35335414ff833479fbb2a5a997df994d16bb42b21775b5a2
-DIST listen-3.4.1.tar.gz 56014 BLAKE2B 7a44a1ca960d8ae0cedd3b0128c4d8048b6f4f4168fa522c376708ebac1996076b36ce3054d179f5bb2267328473f63ef3ec2cb0c22a1fd56c5aff957a3c77b8 SHA512 fc745b7a825beda526588a5227c81c6f3c686d25968fc67c9c0df3c2beba343fc558453dd5c51b4cd82b072b3834526403ad5c06cda2cb57362bfafd105d54f3
-DIST listen-3.5.0.tar.gz 56232 BLAKE2B 55f7c70625165b368ebf62c1327a86daa512f6597e3fa0ae08b6069a9cde5a69ed2ae9928258e61b06838c058f8d5d3fa968a6caf2848ef958f04272b55db88c SHA512 9a855f0ee3fd5d542863d6d9ee072b1fb85f52a00d79dff43a48a43530697613cc17672f30de71d0eec1139080836fa1b316a07fad5c87d43a3cc1bfa3e48dd6
 DIST listen-3.5.1.tar.gz 56236 BLAKE2B e74186532d5aa9fa7488d0734867d7ec7218036b10769667b8818d057af4d8a973204ce68f687fa508d5d2ed879b0ba6287c3b93fb05eaedfc63a8dc251523b9 SHA512 d7475e295b5123c5a8f166891e866de60379f28d61ab0610774bdf499bcf0859807ea2abb31fd6e708c106f926282376aec94ce268e6709884a63852e820ae74
 EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
 EBUILD listen-3.3.3.ebuild 1201 BLAKE2B 5db4e313fc8bc0a67e5ba7a2b8a14330ed78e02ea82989981c64ef3398e30d9f12b555eda9e11cceb242302daff8252b6f2772a843ffb8f3f3147ddc2bdfb1ef SHA512 2715c9493641cff9f1d980cc298b7ce85d8b6e27d776c7461e273e85a8327a57ebfd81ff522bdfac1b8dade7fb47c161a0dd7cead9fc08965bcdcebeb65c4c0d
-EBUILD listen-3.4.0.ebuild 1202 BLAKE2B 437f65eb29fee061d5dbb34179cec9e7058d1af8d2963e0ae9a3a9c66a68985402d1559fa0f8c387889f9bdaadf561a3b8d472c00d5ba74e1dc6a76c1d6ac81d SHA512 d50f8bf4946406d636ef0a2432bfe2b6569ccb59c69ec5da132147c4047ce5428672e9089188a70b64745c3765e5c1a516934a9d2b0a447ba75af795e2c2071f
-EBUILD listen-3.4.1.ebuild 1202 BLAKE2B 437f65eb29fee061d5dbb34179cec9e7058d1af8d2963e0ae9a3a9c66a68985402d1559fa0f8c387889f9bdaadf561a3b8d472c00d5ba74e1dc6a76c1d6ac81d SHA512 d50f8bf4946406d636ef0a2432bfe2b6569ccb59c69ec5da132147c4047ce5428672e9089188a70b64745c3765e5c1a516934a9d2b0a447ba75af795e2c2071f
-EBUILD listen-3.5.0.ebuild 1202 BLAKE2B 437f65eb29fee061d5dbb34179cec9e7058d1af8d2963e0ae9a3a9c66a68985402d1559fa0f8c387889f9bdaadf561a3b8d472c00d5ba74e1dc6a76c1d6ac81d SHA512 d50f8bf4946406d636ef0a2432bfe2b6569ccb59c69ec5da132147c4047ce5428672e9089188a70b64745c3765e5c1a516934a9d2b0a447ba75af795e2c2071f
-EBUILD listen-3.5.1.ebuild 1209 BLAKE2B a96d3a942c34c585bfae4da0e520c50495eda4135bd67793e35bfbbb7d37792fe8c7f7d59cd6320f57a183c6cfaed0c0688165feb87badea9a66c3e864adf171 SHA512 14df22b66bd616717b635c70e51ad030f8cd794baffe886b3ee91f173d126d28ce2f707c9aab929c729070a7770ad8c7586512e9666464e8ddaaab0bc484355d
+EBUILD listen-3.5.1.ebuild 1208 BLAKE2B efc9f7ccc344a4272fa0879b6de1652b88041fc2bea9f8b174dfe3bc3daa11fcf773792bb9c55df41f997cc516c4574efce310a592e8519fd0092e5b84c594f9 SHA512 1788a9eaef1d08d9a5c2f09e3e0285daf0f603feeefd6c04db54992d55a2a52e82cfb5d73e7a11380512b295be187ec70d1615a79b0a22884feeed599ab30e19
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.4.0.ebuild b/dev-ruby/listen/listen-3.4.0.ebuild
deleted file mode 100644
index ee04d1c2272e..000000000000
--- a/dev-ruby/listen/listen-3.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/listen/listen-3.4.1.ebuild b/dev-ruby/listen/listen-3.4.1.ebuild
deleted file mode 100644
index ee04d1c2272e..000000000000
--- a/dev-ruby/listen/listen-3.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/listen/listen-3.5.0.ebuild b/dev-ruby/listen/listen-3.5.0.ebuild
deleted file mode 100644
index ee04d1c2272e..000000000000
--- a/dev-ruby/listen/listen-3.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Listens to file modifications and notifies you about the changes"
-HOMEPAGE="https://github.com/guard/listen"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-# Block on other packages trying to install a /usr/bin/listen
-RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
-
-ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
-
-ruby_add_bdepend "test? ( dev-ruby/thor )"
-
-all_ruby_prepare() {
-	rm -f Gemfile || die
-	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
-	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
-	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
-}
-
-each_ruby_prepare() {
-	mkdir spec/.fixtures || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	rm -rf spec/.fixtures || die
-}
diff --git a/dev-ruby/listen/listen-3.5.1.ebuild b/dev-ruby/listen/listen-3.5.1.ebuild
index 4f0f5cd73c9f..02939cccff71 100644
--- a/dev-ruby/listen/listen-3.5.1.ebuild
+++ b/dev-ruby/listen/listen-3.5.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/guard/listen"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 # Block on other packages trying to install a /usr/bin/listen
diff --git a/dev-ruby/loquacious/Manifest b/dev-ruby/loquacious/Manifest
index dcffdbf89833..797e8c058de0 100644
--- a/dev-ruby/loquacious/Manifest
+++ b/dev-ruby/loquacious/Manifest
@@ -1,3 +1,4 @@
 DIST loquacious-1.9.1.gem 22528 BLAKE2B 5ab28283e40f63a1bacdf6e7ca0c3c9e64527c21bbc7992720b7e2581c156fd449e18e56e10d6cdbe6c4238e129a0b99f5bf1b0487afbd3fc988ba6e9835d37b SHA512 49d176d0229e80a5af69a7cdd24fb2947332faeb70846f28c21249e5297d81246f55eb7f033cc444999267ae727b26f7540f1ec4a542a65af11c3d3ddf7bb129
 EBUILD loquacious-1.9.1-r2.ebuild 662 BLAKE2B 42cb34b69b4f21d705755f1e5c4befd52337e3bff9915e6225469320c8ca088261ea6c09d2743dbb2b396282a7742de3ada75d1e7ad6837542a872070494ba9f SHA512 f345abcca1c9be6fb9567dfff6334c3b9a6ee92c05498e143e9a188e4875a47bb61bc0be0cc29179cc2aef2549f6e6f11b0cd0235965a8c76cb1380a49c84513
+EBUILD loquacious-1.9.1-r3.ebuild 531 BLAKE2B 29fd2a28d437033e3d813f4923964d74be25e86361b44776c103189bdf9231530e9dde66e286d0450a631b42a6f37e052d3f9ad3ddbe0fe79b7b2c0c1e317fe3 SHA512 67bdf578219575e2284cc0f09339ffec99d32fdd912015a7e567bbfd0db1ecd38e23c9cb39b7fba354b07184110863345cc41bdd6972ac09b48b9f158c5969bf
 MISC metadata.xml 340 BLAKE2B 7d541010db79dff55ebd4b1a4a42501ab93b654f0e732830ff7bdefb8b675b45fcda73a8b07699bc9d73e67937f5d168d29d2f9289902b1cf5b5aee72e09f275 SHA512 b68c4a29f683a2a736ebfae1c9e0ba646e80a4384946dc69879494c495b29f4ee0cbbbcfc42f0cc6ec6b8460c773d2ce410748ffb9f1ac81ce8394dd3b61621c
diff --git a/dev-ruby/loquacious/loquacious-1.9.1-r3.ebuild b/dev-ruby/loquacious/loquacious-1.9.1-r3.ebuild
new file mode 100644
index 000000000000..745757a703e4
--- /dev/null
+++ b/dev-ruby/loquacious/loquacious-1.9.1-r3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Descriptive configuration files for Ruby written in Ruby"
+HOMEPAGE="https://github.com/TwP/loquacious"
+
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/lumberjack/Manifest b/dev-ruby/lumberjack/Manifest
index 6071ab965ccf..21ff6ba3d213 100644
--- a/dev-ruby/lumberjack/Manifest
+++ b/dev-ruby/lumberjack/Manifest
@@ -1,9 +1,5 @@
-DIST lumberjack-1.0.13.gem 26624 BLAKE2B 16e911d832425d0adf8ee1bd18435733c5451b705c48493dd80e5e8f6b07cb462be2686dcce7a8c46b799fb8a4fa1a82d4d9c06e675cd6e7a990d93140cea395 SHA512 e9e9c65bdeb42de51ad27b70c86d36c5e63e8d73c3568661d52619ca9eeab36cf6aede5e6cd6ab8e8d30446c0b0e7a9702f696e03e06d8b7a73e1c028953eef4
-DIST lumberjack-1.2.6.tar.gz 39474 BLAKE2B 2885a143afd4793ee78b0e8d849a677fbeae94c99bda0821f759b174f68d7c1de5e6e59ef2dc68f99e41c24c6228787098571276b2aef208cd1aecbd17afdea7 SHA512 d8b5a098c9a14fd5d4acc7fae5801a07fdb1927e456c90a666dae8107ee12cad20d34f0b9cf69f2d661fe07af11def74cd1d529c88e17df213754178492de44c
 DIST lumberjack-1.2.7.tar.gz 39559 BLAKE2B 2f7a5630baa5f683e137f717a7482b4bb889ccf71293b2f52a799effc23bb94ee90ed10c1bf0c9ad649de12347f22a5a66398344d0dcdde3626427fa09782c9a SHA512 356fc44669e70d8fbc05c4f8cb8296a19d7918dd34f0232a750d714fcb511146423920baf7aec8e58e099e3c72ea4d0ad63bc0b3cfd7d337603ec0958efbb008
 DIST lumberjack-1.2.8.tar.gz 40896 BLAKE2B 5a2ee1ff750e29c0869ddc8991fd58e2b4dbf69132e2a1c16e414c5373eebb0249ada7fe922666a3cfcd6875aa98e8b2e0f5f73b391ece2fe75e13fb2968b29f SHA512 8b1d9a402112ae3279e3f2b0d498e6d40faca3ed9046bab1b35d3e863dd0d8f143700f0b7039c8d6b24bde517fceeb9d1b7a8b4259a97908a34a94338f1fd995
-EBUILD lumberjack-1.0.13.ebuild 490 BLAKE2B 4f960adbf78cf85621bd4b4e9b87c53a1d0a067bdb1b78eef88e1e8fe658338ed49f9837bb4eea1de0f3963d348a432c41ea7ebcd09e331c30c3ae1604bb2e57 SHA512 1cde4cb7d972656a39333a56bd81fab0e93303a80b87f48a3fdf5bbe51a2a366f3e9d8727538255055d054d55290be8dd39048749665112ac6439555c200a64a
-EBUILD lumberjack-1.2.6.ebuild 682 BLAKE2B cbc6a8075f767c6440593d562c39c1ecbebbcfe6c494a4faa40617820602c6e77eba7949a59db5997526c8d71ef3551d8658edeb5072c09696153ef4a037634d SHA512 e025670f600add0847240f0d382c32af2cdcc4ac31daa814bd849b4b116b92e28e22f6253ac1c2ed6e174e21f1e10d262fb8e67fbb9db520875954107a372e5c
 EBUILD lumberjack-1.2.7.ebuild 682 BLAKE2B cbc6a8075f767c6440593d562c39c1ecbebbcfe6c494a4faa40617820602c6e77eba7949a59db5997526c8d71ef3551d8658edeb5072c09696153ef4a037634d SHA512 e025670f600add0847240f0d382c32af2cdcc4ac31daa814bd849b4b116b92e28e22f6253ac1c2ed6e174e21f1e10d262fb8e67fbb9db520875954107a372e5c
 EBUILD lumberjack-1.2.8.ebuild 702 BLAKE2B f5790318ccc19cb5310425f5088a91f7d58737a8153260f5cec823686671d7ecdb714f8d91fd83c9a19dc292da88091a4a4dfbf10a76227065f9ac68d4e0cc61 SHA512 b9f43004450a8818fbe28f24137428370084252fd3335e41d66c34ea319970a32b937c520922e24441384d668fd035a1eec2198285c4aa97e441089c0898b1f5
 MISC metadata.xml 344 BLAKE2B 7e45c518c60301bd5f6124f1e3dd9efc6025f889e905e39738414e307cbc91408fbdd6d64b9cc186edaa5d87c4292f0581f4b3ee4d06a3784b30a7f3236d3dcd SHA512 7bcfe06a1c5aedd0ff84769299b67bb8fdb41f59f0eee95f7b39c05d1419b1b669083e46db61d04732937f38fa0735b9bd1bef86df1e36fafddb8ed038a4cb7e
diff --git a/dev-ruby/lumberjack/lumberjack-1.0.13.ebuild b/dev-ruby/lumberjack/lumberjack-1.0.13.ebuild
deleted file mode 100644
index dd7457f682dd..000000000000
--- a/dev-ruby/lumberjack/lumberjack-1.0.13.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="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple, powerful, and very fast logging utility"
-HOMEPAGE="https://github.com/bdurand/lumberjack"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.8 )"
diff --git a/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild b/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild
deleted file mode 100644
index 941c0d361977..000000000000
--- a/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="lumberjack.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple, powerful, and very fast logging utility"
-HOMEPAGE="https://github.com/bdurand/lumberjack"
-SRC_URI="https://github.com/bdurand/lumberjack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.8 )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/mab/Manifest b/dev-ruby/mab/Manifest
index fe933240d918..bfbc5df453b7 100644
--- a/dev-ruby/mab/Manifest
+++ b/dev-ruby/mab/Manifest
@@ -1,3 +1,4 @@
 DIST mab-0.0.3.gem 25088 BLAKE2B 70d250f0fde8a2b7cc8bd50836b8a95b9c0d3e4c738ab2698781c685de508ee58465ce2710ef1fdc63316bfd4db9e16b1951f0d04a9db2a7b9ec0e237bd1c416 SHA512 0761a8de59243356981555ac5000cd98a0413f75bd9eb84848f8efd77be1895a44cf3b90f1182193f90c63a256ebe4a179e8f94a992a30f30ccaf4183b8d4c67
+EBUILD mab-0.0.3-r1.ebuild 541 BLAKE2B 4046369675a31b62a70eb7f6d650cbf6cd848348e6858ef1ae4f43de7308d4d603cd4aa8d0022e81aa1b74daa43545b70e6d99b192ceb35e713d031d9d7d3223 SHA512 ccd2a309a7ab963ae03ca857b3870b6c0a891aefce8fb831af7216381aac1a1295a125b28fff150e67439bd965585466b9fc21317d73ac65f17d002c11851c2a
 EBUILD mab-0.0.3.ebuild 573 BLAKE2B c042d8ec7ea0b0b24fd1749d353e03f778446493bc2c4e5e01a0cd50e03fb0bd4e71901e4589f10b4abc7e6890601e61416e08bca549be4e056f7d87b286d4ae SHA512 35f973d05a03dfebfd064c9000b51e984bbd94a4790525e092979df4d98935c642ae03b4eb05fd64fa5d680c6430109aafb4ec1d44cd838cf8e24c9bf3f51d5b
 MISC metadata.xml 337 BLAKE2B 65d4aea77f54f888fc65d68815c6eba286e79571a6bde73d96cc20cfc220383e2604cbfe2f2ed21c7a95ff029aefff585b5651210632b32e5fa37d27a5adf65b SHA512 41b676005fd23abfa8809dd03a0b3beb994f0831e1b9a9a6afac7d1feb6462f04da0a9ae5a0f3a32d9ede7b8598330d96bada693850355ed1b29ebe64c7a292e
diff --git a/dev-ruby/mab/mab-0.0.3-r1.ebuild b/dev-ruby/mab/mab-0.0.3-r1.ebuild
new file mode 100644
index 000000000000..5bd2144edae2
--- /dev/null
+++ b/dev-ruby/mab/mab-0.0.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Markup as Ruby"
+HOMEPAGE="https://github.com/camping/mab"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+IUSE="test"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/minitest-4:0 )"
+
+all_ruby_prepare() {
+	sed -i -e '1igem "minitest", "~> 4.0"' test/helper.rb || die
+}
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index dd80cf72021d..40de21b0ff8e 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,5 +1,4 @@
-DIST maxitest-3.5.0.tar.gz 61982 BLAKE2B 2098e0b1c2f77ea535d78e5165ba9289a8470ce5c883a0994b03b822cdcba2a6d90077940a3d483505579fc7c89f347f0d492196b28fe8292406e5d6975c6241 SHA512 1a2557cea0ac70d3fd9b487157e5b6943dfd5cdf8b953731041d495049a9c58be84110e831cc57171ded3d5540ce5a3cd3c68e97f7767e30b04e933849202f40
 DIST maxitest-3.6.0.tar.gz 62261 BLAKE2B 4863b5892997ea7019d5dc65d1adf7febd7934e743276423b1fa8b1d81f3ec5d1deadbe57890e0af525a91ae371ab4c499be031b9a6875e5fc6f64d2e7c2cfad SHA512 41e816d21769382af598ebd64f918437a5816308fd9a9695a88ed97d05e7b41085b2a6f8343ffea50bc7016562857f09057591c2698e920a6bfbd5536edc283f
-EBUILD maxitest-3.5.0.ebuild 1256 BLAKE2B 0304e5d045c0d97de6f8b1fe02d5d4ec4fd01891cf64c573e8dce4f87a0a339507f9482ab3b9f16357c4647077cf6002309e07c8f53ffe320f0379c48ea36b29 SHA512 789c4399be32d7b5a8a281ae19077905c807be68b168e1d663d01847c98ddaf651edd09003dfe65ca2c7b15ed446a61937e0711e5c9e0ab6022c1d13f1d00158
+EBUILD maxitest-3.6.0-r1.ebuild 1565 BLAKE2B 377bb6c0df0743a218e75468182878f2f338ded43460352a25e372958c369d33b1b7223f7845ae1f0132e769af0be35bdec02062d377db51292da83c71386c14 SHA512 426905ee8c0d9f1fed704e4d65309560da3ef291be6f9d21b6f96481061b4a1781f96389a2e6c4ee2d71cbb66bdf7a546f226bbf4dde94a44b76f447d9e52b15
 EBUILD maxitest-3.6.0.ebuild 1438 BLAKE2B fa81881d717e94e4e930e75c8fcfaf4753ff997966c61a2d79e0cd2ab4f2304c90c5e9581e54db3987b62cf217c0c1ece93ac9cb9a844101a699ea8d5283ad1c SHA512 4f2888e30afe8c1d959a340133cbe1fbbd92e59e072d370a2368d3950b903b16f0aeb6b356ff5f4db9d1835258a2eacf28a5478b65f50af835f8167581502003
 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.6.0-r1.ebuild
index 23c274fbfaee..a12d19fb13fd 100644
--- a/dev-ruby/maxitest/maxitest-3.5.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-3.6.0-r1.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="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="Readme.md"
 
@@ -18,10 +18,10 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend "<dev-ruby/minitest-5.14:5"
+ruby_add_rdepend "<dev-ruby/minitest-5.15:5"
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"
 
@@ -33,6 +33,12 @@ 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
+
+	# Allow minitest 5.14 (added upstream but not released)
+	sed -i -e '/minitest/ s/5.14/5.15/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
 
 each_ruby_prepare() {
diff --git a/dev-ruby/method_source/Manifest b/dev-ruby/method_source/Manifest
index 3c2592b6ee69..c1659bae4b37 100644
--- a/dev-ruby/method_source/Manifest
+++ b/dev-ruby/method_source/Manifest
@@ -1,5 +1,5 @@
 DIST method_source-0.9.2.gem 13824 BLAKE2B 842277a0a38331430c3c6a9f45c01d965de1997d8e9aa291d1948103c9812a23c5e67f3e7b7a2e6ec982de2a5eb841a78f6b8d1633ed17c5b7fa916698737ffb SHA512 87bac1d9ef2f1b09a26358d6d2e7e1035703d1bee9b6689567e8967baa544a456b63b2a1271305979ba077ebae32062708666588500e5810dd9f8e282d444b8c
 DIST method_source-1.0.0.gem 13824 BLAKE2B 1b6b4c23b2e73972acb69bf488f39d88fae3bffdc4e28559d880ce817199b9c1da8183f10cf8be5122535415b938c9f3964c9b4bade1dfba7fb4457c052185dd SHA512 d3a2dace01d987203d0520583120bfe08812237602421efc3ec7ff8054f2403b0aac13f15b8b91dfdb6e6679a519f707ede67ea6fed72cd8242edacc828a9caa
 EBUILD method_source-0.9.2.ebuild 476 BLAKE2B f6a213ef1e29263316b9b3793df3f61d76ad769856626d8d88d89010d3405689da2978dc66a2aa1ae6ac58c57d4b1f4d6cbc5bf46479b182957a81158e2c2cac SHA512 5ac9fa760b314feebcd75be01e06c0913cbd507eb5112bcd403a0226658810767516c8293d2c752a0a8325aa0bf1bc67097e47eac77ec9179780af020bd4e9ab
-EBUILD method_source-1.0.0.ebuild 446 BLAKE2B 6c4d061d8cd5a0a8e582c0bd534f5f8674a438d8d2c146776cebf88128781dd37263d5e5aeb93148ff1cf3b23917df76fe386448d6f3eea9ebc941a47a79ae8b SHA512 02cd035ce8e283f8c3944b5d150f71293d0e747623680348ce20ac12fd509cb8f0d32216911ef926d5ceda466d38c07f169504abc7218565c0360d379655b23d
+EBUILD method_source-1.0.0.ebuild 445 BLAKE2B 0c7613d2cd57c530c66705197e9afbcadcb6c5c05f9b16d329ae950acf4f33a76a96f068854cc9073340a7a6cb0b8274355548b7dccb029feed1b1dabc9d738d SHA512 e8a0c531bec4e2f2dc3cd7a3d43ed598d7a333a2978585796339d1b9c31fe16db65982803fb563bbb967c9829bd6d35d4df0619d2e974726117fa8c92a9552dd
 MISC metadata.xml 348 BLAKE2B 055674d709a654248c63bf20a1867646170cd6b9e2d74cf54b6640ed14b5b0255b2e23986ed068a96412b0c288262fd207d0e267b70f356ee048635732f8a965 SHA512 425721c75e37753f9df91fdc628d1cdad2ab61fb9c49af31405df4070bcf429a703b8696ba5f0a596416f7d7f14ccb4285e39afd15302da6ec753a630d098e88
diff --git a/dev-ruby/method_source/method_source-1.0.0.ebuild b/dev-ruby/method_source/method_source-1.0.0.ebuild
index 1ba70efa2cec..f00c420c41ed 100644
--- a/dev-ruby/method_source/method_source-1.0.0.ebuild
+++ b/dev-ruby/method_source/method_source-1.0.0.ebuild
@@ -15,4 +15,4 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index ee7afde6d6bd..3e844622ab56 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,5 +1,3 @@
-DIST mini_magick-4.10.1.tar.gz 1192455 BLAKE2B 269f0fbf0e49bb14c3a39124dfeb8171775db7a9e51e4662e5dac0a98c4668156bf5bbf22af62a9f62d7834d2205a9475e5631b768d27cac0527cab0baad25fa SHA512 28e4a4cf213db69182adb56daa3e09eb576e96e8ff4ad95121f9a16f8ecceb98ad790d3897463fa1ab3b7d4b9925777f9e71302adfd3f31b3f88aa520371e77b
 DIST mini_magick-4.11.0.tar.gz 1193122 BLAKE2B b736bb1b147ec2b1f926ebf5a3b908e659d6dfcaca0e7199932086e09cfd6be21046dff3c4e0edb7877c40c5bbda73aa0f521b305c15abb6fab931242b4561c9 SHA512 7201a94345aa95bb9466369c78fbc48108b245df77435e839a3f0df7694f4da4eeff3a7b3da4aaabedefd93859abde1145baef6f0f01580f66255653be88f5d2
-EBUILD mini_magick-4.10.1.ebuild 1990 BLAKE2B 630ff5d1420dc6051221da38ecfcb1be467e75919332ed9e55feabf1585cfddcd45966d5bff3a0b87fc08e583e06f0314e9d9e7cb26461d19ecedf60fe60155e SHA512 ffeb65b0b2fc5c98e2f5ed706f1f2d42763698a9da30b30e4f6b0f6522ddd8c194b5f7c779c854ca3f661e589b971765cb7fa2f40e9e9eca47501b60b0c95ccc
 EBUILD mini_magick-4.11.0.ebuild 2066 BLAKE2B bf5b94eb0974cf5b0491d8cdf870f3fa0a0f78acaa5565b296403e1a13bdaee0bf0daf13c46d086d74422987c85f0c965fd15fbb3f1b350e9593f2f1383f505f SHA512 2c91aae2284eb35944e070d445a15a038dc0cf3bdaf02da8e4004ceb191c0a6a1cce2a847f3bd0896188a0760f81805558eb457c316c5642e1858d3f2b811775
 MISC metadata.xml 347 BLAKE2B 679c10bbe1e22a6374f3a45b14364514d2cb3c23e0b965e9418d1c8f10b1b036bbf019539d95fbf19630d6f315a930142575da49d237c782f7a11b100fa7fd2a SHA512 9b98a4a0ec7b4c2945df5300ad26d8ffe1394294d0c6e142dc7e55e2cd270327df70fed857ff7d6f12f6b0212d6c25b8043be7800fdcca20bd58d14ac75fe6d5
diff --git a/dev-ruby/mini_magick/mini_magick-4.10.1.ebuild b/dev-ruby/mini_magick/mini_magick-4.10.1.ebuild
deleted file mode 100644
index a9f8f5aaed8a..000000000000
--- a/dev-ruby/mini_magick/mini_magick-4.10.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manipulate images with minimal use of memory"
-HOMEPAGE="https://github.com/minimagick/minimagick"
-SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="minimagick-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-# It's only used at runtime in this case because this extension only
-# _calls_ the commands. But when we run tests we're going to need tiff
-# and jpeg support at a minimum.
-RDEPEND+=" media-gfx/imagemagick"
-DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/posix-spawn dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	# remove executable bit from all files
-	find "${S}" -type f -exec chmod -x {} +
-
-	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
-
-	# Don't force a specific formatter but use overall Gentoo defaults.
-	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
-
-	# Avoid broken spec that does not assume . in path name
-	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
-
-	# Avoid spec broken by recent imagemagick updates
-	sed -i -e '/cache files generated from .mpc/askip' spec/lib/mini_magick/image_spec.rb || die
-	sed -i -e '/does not hang when parsing verbose data/askip' spec/lib/mini_magick/image_spec.rb || die
-
-	# Avoid graphicsmagick tests because installing both in parallel for
-	# tests is hard.
-	sed -i -e 's/:graphicsmagick//' spec/spec_helper.rb || die
-	sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' spec/lib/mini_magick/utilities_spec.rb || die
-	sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' spec/lib/mini_magick_spec.rb || die
-}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index fbc2c7676d7f..90549f91b255 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -1,19 +1,11 @@
 DIST minitest-4.7.5.gem 57856 BLAKE2B d0ecb0a0693c35ebbda52e9c755b72f07e38d6ccc266312a3426f9de3c40165d68bf07d5ed162ce51e31b1bb8502dc844fe61d9e93733108501f156c3096af23 SHA512 7ea0a52d37f4631fb8b11d4389da2123e4207093f7b34c497fced8729c9086faaa35e997debdb53b694e05eb52b16e843960f0b54515c32207f87161a76c3851
 DIST minitest-5.11.3.gem 79360 BLAKE2B c348957e094bd91e88c6dace522b8e88c37ec435d58b4f6f8c8b458cfd26b789cb00cd43fa9d515112a8f3c9a736756d59c46f4117d1c1948d08cab0a5eed6aa SHA512 387537aff51f8e8f9cc2feddadf6813d11f0ba623ae3d5929d7b7a88e180b60c961dfa1d2ba0f3a4ad7d2c1af250245376fa62b23f68c8b57812c7e86efba0c7
-DIST minitest-5.12.2.gem 82432 BLAKE2B fb8df3d5407a96b7be9611c19763a4480c20ac29aababc147f14f0684926806a76e2b38a75009a11cb2cb1e3ded371ef5b9275ddb87251496315f0ce023e4382 SHA512 7a14769e7eb1c4c950380da86a1e7ff8836f05bfb5b08216f4c0fe9e1709982e3f189fb579b1d74b307f6a17e3136d4ec3d7811562415942154a905364e1428e
 DIST minitest-5.13.0.gem 83968 BLAKE2B 90f2bc20328a5522a51bcfee94d69e6fd03189190a04ee77499d574531e95b8f8b6652cc51a5917e51920f58c0f95465c27c5d69bab7aba01e02502ccf72ae38 SHA512 bdd0d665cfd6f6e36dcb1f2f069f5154a468f68eb4c41f5c39e3a3397644141d5e05024023b20fafbceb983b019b00a0ec6da98432f505cc8fd1cebc11cc1fca
-DIST minitest-5.14.0.gem 84992 BLAKE2B 3bf733ae992e83af862773b6b76997b7a3262290c8239fe2871e9d55bfdd0a9c921a88965167a693794e064fcc2efdf9f6c111075f59921c55669fca1a8ada27 SHA512 4d65cbc96fe96bd79fd1dce36ce3b72d8e01efc12dcfeb6264075bb36430110f1c8fb519e0885e3449379fb5237cbdf7e24803ef49034e46ddf1d3a24c56b45f
-DIST minitest-5.14.1.gem 84992 BLAKE2B 1bc258ea21ff887381ce9d13ea08f07d6242bf1daa8e65063ac9bfa41c5a9363d0c7e25356d803e780814fcc62c54b9f62e76c7db8e0666f19dbb52bd94e171d SHA512 57a205ce8f71a494d9d8b0343cbc39f8d3ee22f33145b53b6b0bebebc0a2ed542eba3e1df91bf115be0910f0c2e65d5c24be6b595f13e6ccbbe417e06c54ffce
-DIST minitest-5.14.2.gem 84992 BLAKE2B 2cca1cbbd7588d2bd77458008a0dce0dcf34e9e68fa0ab7eaa79a72515c3d2399030db61905e84835596dea5e854a4a0708096f3b401ca8fb61c3da0823a8ad5 SHA512 c1cdb87824382233d4ae0570346a6888ecdf0dddbd5fbc9bc136e1c8ed9e1ce57d08d5994f57ba1eee99a38e48a04a10a32288d34ce10ca4ecdfa15587cf602e
 DIST minitest-5.14.3.gem 84992 BLAKE2B baad3e8198bcee1b2748f81a7ea822785423c2bfb07130397b2c21993c686aa6edf58811cd58c4c9685b63b8a7373948a0aa2eacb6b02383399847edbad5deaa SHA512 2aadb99c5eac8d29c78865f8ce3fae51f11c2e1dd17157b6d0c6684733a3b870146df16fd26626c6f9c56806422e1e2457208afa1c69238a2bdaa4a859c23645
 DIST minitest-5.14.4.gem 86016 BLAKE2B 1f7b8c72b41e1f4e47852021dd99df411a427ac8bbe564a2b86edbb727a4976030176331442a3a44f734347cc42f80444f8d3937e561f0063ec6bb3132d4c402 SHA512 f967a11cfce82e167879905082859273b270e8d8e663a0c1c553964a345fb8564547627b8cf97418ac5bda544bb76c1385438ad74ec8e846666dc2952d55c9e9
 EBUILD minitest-4.7.5-r2.ebuild 856 BLAKE2B 037aea7db96dd5a1527932f4ecd421ba48d039124492e2db19e11b09b5402cfe080555733097f5bedb1c1e6742af47e2b200f6174efabcf9296a85ce4f97da5b SHA512 6b6aa378b9321e4b4d8899ae1483630f10eb1fa5b433c7a7571d9c78f8c87e461296e0f058cc359d19df0b3e6b01a142a40c620ec7a682ba8f188709f2588bd9
 EBUILD minitest-5.11.3.ebuild 752 BLAKE2B 48915acc329f6639fc20abef18e420a51d3d76087e642cc8a58c55caf5a5f134d7690ecc60702890f598dc51eb8208092d179c2f2d1934e1231e8d1f1789a17a SHA512 7b44b8c01f1327d50acb399260575cac827ebfa3ddd463b582fafdd8197957d1225f9ca3a00355bf94b3930f0d10a95ece0f9747857cb011ae55a34f9f8c5c72
-EBUILD minitest-5.12.2.ebuild 721 BLAKE2B bf109a1758943ee0f8f4d7d876ea27dcdda8ff21fe81cb6a5fdc621e0ad83dd3aa44f9fdbd2e2f16d22bb745100fc433deac24c2227358ae669985e653536157 SHA512 44802ee3cdcb312fbe791f9cbcc9d205186fcc4e3c8a05bd7572cb52714d0ebef26d6cb317740a8db9ede5e6c6fc4abf2c970eba2a003370e2a82eaa601c60d9
 EBUILD minitest-5.13.0.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
-EBUILD minitest-5.14.0.ebuild 728 BLAKE2B 2fa50d6a799270116cb7a2a27132b74d7116e3295017a17df7d8da7e8069b156b64c6a6270048ee8c417af4c34da49992ae3590a2001a7aab3ffe9f58109b26e SHA512 4458ac2dfaf0ebf2bbc7a1e6fd18bf7841e5871e1e769f82b27e612e53a9a313524d486602fd7423935226844c2cdf71947a0374fe28ddf3be65dd128dcbd018
-EBUILD minitest-5.14.1.ebuild 728 BLAKE2B 2fa50d6a799270116cb7a2a27132b74d7116e3295017a17df7d8da7e8069b156b64c6a6270048ee8c417af4c34da49992ae3590a2001a7aab3ffe9f58109b26e SHA512 4458ac2dfaf0ebf2bbc7a1e6fd18bf7841e5871e1e769f82b27e612e53a9a313524d486602fd7423935226844c2cdf71947a0374fe28ddf3be65dd128dcbd018
-EBUILD minitest-5.14.2.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 EBUILD minitest-5.14.3.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 EBUILD minitest-5.14.4.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-5.12.2.ebuild b/dev-ruby/minitest/minitest-5.12.2.ebuild
deleted file mode 100644
index 0a5415abf2a4..000000000000
--- a/dev-ruby/minitest/minitest-5.12.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/minitest/minitest-5.14.0.ebuild b/dev-ruby/minitest/minitest-5.14.0.ebuild
deleted file mode 100644
index 2e7cac7c3ae8..000000000000
--- a/dev-ruby/minitest/minitest-5.14.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/minitest/minitest-5.14.1.ebuild b/dev-ruby/minitest/minitest-5.14.1.ebuild
deleted file mode 100644
index 2e7cac7c3ae8..000000000000
--- a/dev-ruby/minitest/minitest-5.14.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/minitest/minitest-5.14.2.ebuild b/dev-ruby/minitest/minitest-5.14.2.ebuild
deleted file mode 100644
index 414bf91afda4..000000000000
--- a/dev-ruby/minitest/minitest-5.14.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
-HOMEPAGE="https://github.com/seattlerb/minitest"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
-}
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 74893ae5978d..50beb4aae588 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -1,13 +1,9 @@
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
-DIST mocha-1.10.2.gem 240128 BLAKE2B 50c638a729cf7e11b982f60b3e511166ca896d67167e8c4ae1c8bdb87fed11c9feef21046f84701f93131e1399320635eeb73a8f08adc1f38a4b36e2134cc690 SHA512 efcfaa266f8e6ac84598f69078855f9a36aaea1f5f6bb2b6759ed17577c390bd60c52b0e09de3c2099cc72e6731099f55b647cea158a4b3996d290c79d006670
-DIST mocha-1.11.2.gem 242688 BLAKE2B 60df172257e8767fd3b48e3716cd31cb69ec6f10cc74908bee2e0dfd2d042550b10c7ffc8d2dcf05853c96cf2745fae776bdc9abcd6728f5a4f3fb349d997bec SHA512 8408d7b4c4d979caebabb75b1b870e6473fb0a5abe6055bdf7b4c4679b92c963138ec9a2947e60b9741a2cb50ea7ddfe949544dc4b0bdac22242b2a7eb5fd54d
 DIST mocha-1.12.0.tar.gz 244820 BLAKE2B efc4b40509cef44d976b1556e4977258f1b37a314e37f492943fcac955c681d17008a1db30f963d7a6adcb788b1832439e0585899c99ed8f2ece69c887952e91 SHA512 969a6cd48d925845004dffa12f8a9dad155d3bf24b974957e9921a2e13dc67985f01080017ef9e82dacfd4bf87533774f3f5d15226923bdf50f8b90e95e1730f
 DIST mocha-1.13.0.tar.gz 246249 BLAKE2B 028b40646b96084f26df9813a8c8c4d5adc9f4649e11971069af086716d84f90f1acc6abc8fac8297c3a516afa51049c4bcd7ff0f6fd3917d0665fa6f9afe754 SHA512 84cbe344b0bae434e9931a83b587dcefc14e8699893022a56e30a59bff574b52e3879a123b8f2f70e77301701b167d5992489e2173191ffd3450f09db3e7383b
 DIST mocha-1.8.0.gem 223744 BLAKE2B 625f38d6ec53cbf549cbace873172b8511f2e6a2ccb5d7fd4133c3d9a67a8e5d55626fead7a70de363c8564b687530d3e0515ed7fc167a65091d9e17d89dde47 SHA512 b0abd6234f34dfd92d44019001e97914dff80ece5fbe2b53ccc91192f99f06a79f9c96cdb136b2a389a1a1b7038076fce688d8d8ee8645538d3c58f73e345fe4
 EBUILD mocha-0.14.0-r1.ebuild 859 BLAKE2B 21b52a1a7536026edaa71da09aa1f25b41c88284ed8660c9b3d675ff41c5c54758777c27860ff8511d24152d120cec8bdb85980ba0789baee1a4f8a1dc80a2c1 SHA512 bff61b26bafa6d8aed42c4cf00493c88c2f64cc54e723cc04d069f9d399c88c2192298019bf048e16da93613c106318c45fece5c10d889f608273f71f29c0756
 EBUILD mocha-0.14.0.ebuild 885 BLAKE2B 7bdb2eaddd983c06460cac0320e6ab2f4ef3ceeb76f0e64a5b4db3f61d9338f50628d946294667a47a53b1d28e23710af1e7ff4e6efdd0d32526418ad5600b84 SHA512 d3c0ff9fa348c19cedcc4aee99ecefda3a1db963b9be5067dac4d31d074e08288f8c03455220b00f7f6d65ccf1a1573c3fa629fb4cd3373dbc238bdb890eac70
-EBUILD mocha-1.10.2.ebuild 786 BLAKE2B 6b30a8ff71632be937cbd0b6cd4300ba3313eb49d5ba980721349a7c0f85f3e3b803b69da63c05487cf2a7c682a1e9844070c0181438a60b89375c6de9f54d42 SHA512 6ae0eca663ed3c2054c258604166a56bfe2466bbafde758722f0c51393790459fdcbed2015ecef94745c53a5cd18e53b2bdf89a43b663cd5b46610ee4f0a80fa
-EBUILD mocha-1.11.2.ebuild 793 BLAKE2B 9ac48088e0140794d0cacec7d33254750e12fdf0786933dadd7358da1dfd48dfe308659fb4185e7600c2b5200652fad5b7125ff51a7c3d6913d1f55392815e62 SHA512 c5764b88fc5434681ca0126d171778c58bd4ccc0f6963e6cf2f009a82654e9d856db564363322349156c6288e563c184dab0fe54ad5a8358850473438130f547
 EBUILD mocha-1.12.0.ebuild 992 BLAKE2B ec903e2f555fe7c721fd177929bef26c9875e33c902926125f0bc1f1d9acdc7aeffa926fe7a58d8c93ff5bbbace076182c2242de12c2cf6c8172d5e114432819 SHA512 3a64925befd828a2adbdd139d819eddef43e97e6d4399bb3c033101ff704eab67fbbacee76674cfb325cc1290bdd0a804f9a817df7d3ba50010c1256485700ab
 EBUILD mocha-1.13.0.ebuild 992 BLAKE2B ec903e2f555fe7c721fd177929bef26c9875e33c902926125f0bc1f1d9acdc7aeffa926fe7a58d8c93ff5bbbace076182c2242de12c2cf6c8172d5e114432819 SHA512 3a64925befd828a2adbdd139d819eddef43e97e6d4399bb3c033101ff704eab67fbbacee76674cfb325cc1290bdd0a804f9a817df7d3ba50010c1256485700ab
 EBUILD mocha-1.8.0.ebuild 862 BLAKE2B 5de8d30303f52c1d13add741dad6d80b279cebab848d9371c2f60cdedd766ea5ae49fa50508bc6395b32990113c134617b2faa44040ac990611391d54b58c678 SHA512 b94cc3498d028871591e6b84c0b3d037c058c0eeb6cbea04a1d70a8d157215fa9bc62194bf2d11fa1e5d2a57e2e848b32fd0ba0b6e737895b4f46cc9388fd124
diff --git a/dev-ruby/mocha/mocha-1.10.2.ebuild b/dev-ruby/mocha/mocha-1.10.2.ebuild
deleted file mode 100644
index 217ff4dd19c6..000000000000
--- a/dev-ruby/mocha/mocha-1.10.2.ebuild
+++ /dev/null
@@ -1,33 +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_TASK_TEST="test:units test:acceptance"
-
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
-HOMEPAGE="https://mocha.jamesmead.org/"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-each_ruby_test() {
-	export MOCHA_NO_DOCS=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/mocha/mocha-1.11.2.ebuild b/dev-ruby/mocha/mocha-1.11.2.ebuild
deleted file mode 100644
index 95b6d1545f34..000000000000
--- a/dev-ruby/mocha/mocha-1.11.2.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 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
-
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
-HOMEPAGE="https://mocha.jamesmead.org/"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-each_ruby_test() {
-	export MOCHA_NO_DOCS=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/neovim-ruby-client/Manifest b/dev-ruby/neovim-ruby-client/Manifest
index c9174b15e26c..18e2dc1a5cf2 100644
--- a/dev-ruby/neovim-ruby-client/Manifest
+++ b/dev-ruby/neovim-ruby-client/Manifest
@@ -1,3 +1,3 @@
 DIST neovim-0.8.1.gem 43520 BLAKE2B 0b7401c1dfb1675725dbf50c45626d88b1a5932ccd4836e8a33974b8e71e44bafa10bf1a43e51b7f42e2702facec776cbcef3093c5cf86e500a5e94be9486b08 SHA512 2d56cd56c0817491622f9a4beee4cdc9244e9fd6a4a6b78d69b51f160b1a24395730f153800279b7fdebc99d61c55e3b8944d4b16c1028cfbf5d8c95308d0f53
-EBUILD neovim-ruby-client-0.8.1-r1.ebuild 894 BLAKE2B 30c318169345d750764cb546d3cd50e47bb005c2f6eecfaec64cfca2d6636c6158e284e7f329411cdd2c283f4785bf158b2f7c1e228e8eb37dd92b36b8e3e854 SHA512 0dfb217d3f99081be176a5b603cf073918ade6ab25775d52fbfebb2b862c4e08d97edb2ec0599f31c24654acc9d5ccf9aac5c8a7dac8e126082b657cd85fdd85
+EBUILD neovim-ruby-client-0.8.1-r1.ebuild 894 BLAKE2B 0b2b165cf1b76d3e42b42cd1581689d754b45a916dbef619fb6c4b1987b6d45100ce221b5426ea567380b9976b60f4ad21a624254bf678c8b03fa3be9306c35d SHA512 63d1c81e5ef508dda643a869336bc1010b6c30551dc3698f35ae50e763432c49b7f9e5454ad2f814ba9318358260906ecb591549bcba25b148728a5a144253a4
 MISC metadata.xml 347 BLAKE2B 3d0e5ff3904f2e0b528ff6641829e9881ac0841e236de63b64bcb06d9bd71c032d3419726c674d593535a85645ececc3514a081c78b983eceba303d98bbe480d SHA512 98fbd2d1c6d1f5308c604497caa108ac68a24ad459af2abe51c90ae41a76e0581dcb4af43199e6a71179e1dfdcb98518afd7b2a8bc4f864db67a614d47fb60e7
diff --git a/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.8.1-r1.ebuild b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.8.1-r1.ebuild
index f43de42f4cb6..b80f9588c1d3 100644
--- a/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.8.1-r1.ebuild
+++ b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.8.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_NAME="neovim"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index 8433d9c033de..dbf092665b5b 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,7 +1,3 @@
-DIST oauth-0.5.4.tar.gz 59141 BLAKE2B 1e588d411795b7c5b4ae5b7b3c9928b69aaa005bef858137759757e9f06d6de144408e4dba33d7fbf82a3f2586238a71b85b89c681f5d633453dfe0da954a2fb SHA512 f114f80255944934a276d0f9556ed37e4a0a72b221269cf7792f2c3a5a1504c5ec726fd5b7437b1102c648a6cf451a1c83de4689f53d30ea8c6a1d62662de535
-DIST oauth-0.5.5.tar.gz 60289 BLAKE2B 28a283bdb251b791ab6e0d50e6ed7db09445177bcaf5a99258c465e3783c5535f7d6acee356ec2f7559a942d1146ae8487260f8945f3138de670c20c60d7068c SHA512 9db8d68950b46b469777e320dea88e14506be846233f7c24e7dcdf9b57e761c43a7b715fa70f32a41b15ac7936a586e8b49a33af971fd0e9509d62827c69571f
 DIST oauth-0.5.6.tar.gz 60887 BLAKE2B 8dea7bc6b1a3c9d5befa5badbda105fed28004d6627624fedaf1572cc261421e3a8636019bb0a600a28fb6aa933d2b1be5faf613ae3062f7d50b314b86059b17 SHA512 dcb516b90d6cf0ff3f1071fa7bf1e1b30cd998c79205f9a6df001d5c04784ad23ecd430b4e04565a6351efcc780b552dfc38ea962d0a938c9e19a6e5bd3fe070
-EBUILD oauth-0.5.4.ebuild 1054 BLAKE2B 0171f7c346a4aa6a1d71cfdad59223accde4e560d60d185c5e8accc78ab583395a88dcd94f26c0a937ad92d4fd3fc1222c01cd042740b91c99ec9eb6eb9e73b6 SHA512 cbf832f21e6676dfb2a0584bdc2d4e59e1594becb178babb9b4abf866fe348f20b86d9576584404b00f10fbe1943efb10acb80ea11070351700489c406ce94c4
-EBUILD oauth-0.5.5.ebuild 1053 BLAKE2B e7304763762ecd688764cea37c0bbea669caf19ef4e421b27d848b869dfd2b1bd54d1226410c70db6c48b333b41d3af174711277f5f9df0b22f6de866a89d56c SHA512 297239d72c4bb9873697365cd466efb856b2d999cbabe94025bea30c1b51365c0b027d7e46c669ce02333ae01cdb44ed9a11c65b633b9726b11380b130e946e2
 EBUILD oauth-0.5.6.ebuild 1053 BLAKE2B e7304763762ecd688764cea37c0bbea669caf19ef4e421b27d848b869dfd2b1bd54d1226410c70db6c48b333b41d3af174711277f5f9df0b22f6de866a89d56c SHA512 297239d72c4bb9873697365cd466efb856b2d999cbabe94025bea30c1b51365c0b027d7e46c669ce02333ae01cdb44ed9a11c65b633b9726b11380b130e946e2
 MISC metadata.xml 335 BLAKE2B 47e21b22542a232a341077c69c8c138cb7a9396c1316206553c56ac9492180686dc9131179748612c98c0d6f706e79c8de78a03aa2b2e33587966718eff9e704 SHA512 844bad15eb4d2808ea6d150256a969c97f11e93dcbe44b9c8bfadfbdc6215a949ce7d846dad2c41da79fd82d91b3ee97769dcb0a571e3e88cfc9072af2537205
diff --git a/dev-ruby/oauth/oauth-0.5.4.ebuild b/dev-ruby/oauth/oauth-0.5.4.ebuild
deleted file mode 100644
index f8e8976472f6..000000000000
--- a/dev-ruby/oauth/oauth-0.5.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="HISTORY README.rdoc TODO"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
-HOMEPAGE="https://github.com/oauth-xx/oauth-ruby"
-SRC_URI="https://github.com/oauth-xx/oauth-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/test-unit:2
-	dev-ruby/mocha:1.0
-	dev-ruby/webmock
-	dev-ruby/rack
-	dev-ruby/actionpack:5.2
-	dev-ruby/railties:5.2
-)"
-
-all_ruby_prepare() {
-	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>5.2.0" ; gem "actionpack", "~>5.2.0"' \
-		-e '2i gem "test-unit"; require "test/unit"' \
-		-e '/mocha/ s/mini_test/minitest/' \
-		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/oauth/oauth-0.5.5.ebuild b/dev-ruby/oauth/oauth-0.5.5.ebuild
deleted file mode 100644
index 7fdf4be49c41..000000000000
--- a/dev-ruby/oauth/oauth-0.5.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="HISTORY README.rdoc TODO"
-
-RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
-HOMEPAGE="https://github.com/oauth-xx/oauth-ruby"
-SRC_URI="https://github.com/oauth-xx/oauth-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="${PN}-ruby-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/test-unit:2
-	dev-ruby/mocha:1.0
-	dev-ruby/webmock
-	dev-ruby/rack
-	dev-ruby/actionpack:6.0
-	dev-ruby/railties:6.0
-)"
-
-all_ruby_prepare() {
-	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.0.0" ; gem "actionpack", "~>6.0.0"' \
-		-e '2i gem "test-unit"; require "test/unit"' \
-		-e '/mocha/ s/mini_test/minitest/' \
-		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index f9d1bcf547f0..7f1125f77d41 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,9 +1,5 @@
-DIST octokit-4.18.0.tar.gz 3091587 BLAKE2B b48ccfa35f53b686e61a0f79c09bf20f063843c98f75a0896e71739a33cf9b770c8b5e5c27cda2c8a25ca6255cfa7c4e389b372ca269d4c46b499abf1838a4ad SHA512 e749afc4303f987b502f8c79ff60e33c6f49ff84d25f16cdb3d9165c7089912570a7b77af3716341cd5216e5c8e3534a805e4347081ec7765a4e4f54fc432ce3
-DIST octokit-4.19.0.tar.gz 3121443 BLAKE2B d0ac2daa9409d982d5428dd7fe1414c1707e860d7c3ec6534fb962c38786955ceaeb0f1cb33a8636c18a216fb4e2b8ac2777f7ef8b7ccd433b6d4597d686ffb5 SHA512 bd4171423c84d082cb3c5dea4bfa1bba9584964b8e328d88235a8ecfd084e1188367afdf54b5097049427600451edd72dc3663bca50ff761a44ddbcb001d0a99
 DIST octokit-4.20.0.tar.gz 3127939 BLAKE2B 30b251c95cf664ea83d23473ecbd5d1652586a567775253afa3f0c954490a6381c86da40cdc3761c8c43b17c850dfe9ba80f3814e946f1f3a008be81dd3c002a SHA512 180a4846052dc223b4d5444acc7af7d78151ac941687c75e6853c119ce75d9383fa5ec1ffc7ede97a6ee6d5780ef27030f2132761484099f634be6a3c4a9d7b6
 DIST octokit-4.21.0.tar.gz 3134804 BLAKE2B 67648f7dd3a04b8b5b397d94e1c73329fe6ea0a6db1abff3c5cb5ab443beb1e5874c2bc2f072ecbeee2a13b4de229791c03184eb5fa769ba52e2d8793bf0b9c1 SHA512 364ed578ddef4b4fe50c3848559820819a517d33e2140f2867f70de4fc1e9e5a14c0fcc9b34a6bb6b2240bfaf0b9ff95038e01ff7e857e2bd0ab707f546d9fd9
-EBUILD octokit-4.18.0-r1.ebuild 937 BLAKE2B e0fd6ba0cee38c22e4e520b83cec1ae4f35c90cc9bee3064e0e954f5c01f9bfe97a90c3a7981878796f240cec15086291ccf53bd7751d344418e173f0395ffaa SHA512 3ea459d955bec294bc05535b004dee8fa929e43187c3ff1304eab82861fec30eb9a9f5dcfe8a1d4dd93185069680633c9208b565e45fb74b35a0023097320b6f
-EBUILD octokit-4.19.0.ebuild 957 BLAKE2B 70cfb54a1995d2290c61014fd3f99217b393cb5dd0cb861d24ed9fba7cfa3ee9f0c494b290798c296cb86e06c029b71ba551fdfbd5ab69beb5312937466935e3 SHA512 7493b5b9373eb32cdb3cf6b325e528a5be3404de489e0eea8008feaaf54d10455a059448c775e6e678577e87d0962fa2f5f1f5cf2bffd0059cf154aa4fd215be
 EBUILD octokit-4.20.0.ebuild 964 BLAKE2B 58ae373df60ecd1494a9adca2632cc083a3476430de20d0b3484c621780bff3dc481a82335fd10d0357d67f647fdae1def7de98aa09f94d909003799ee5981b8 SHA512 d56a6181843d5a63f0fa47974ba4f18b1b017f873a93a95769043c579e2ef263fcf4f5499645343cbf7d0b8369e8fed188e612d59bb3a19a5439fb3a8e9702e3
 EBUILD octokit-4.21.0.ebuild 964 BLAKE2B 58ae373df60ecd1494a9adca2632cc083a3476430de20d0b3484c621780bff3dc481a82335fd10d0357d67f647fdae1def7de98aa09f94d909003799ee5981b8 SHA512 d56a6181843d5a63f0fa47974ba4f18b1b017f873a93a95769043c579e2ef263fcf4f5499645343cbf7d0b8369e8fed188e612d59bb3a19a5439fb3a8e9702e3
 MISC metadata.xml 344 BLAKE2B a2013bc4988a44c7d4b2e9dd6005d30390a7fdaf39f37a4adf8b539825b43f5d0eec457dae147b782f90f15d77fa5f485a6bada65be086f67b7350603945cf64 SHA512 3866d3979a8749d780367b56ae524d8f78286d2174602452ba272d26a4fb49cbbe8945183e4a64e70400b758fba4fc6bf88bcdf24908e474a378b628a1263457
diff --git a/dev-ruby/octokit/octokit-4.18.0-r1.ebuild b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
deleted file mode 100644
index 52e084a9cba4..000000000000
--- a/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby toolkit for the Github API"
-HOMEPAGE="https://github.com/octokit/octokit.rb"
-SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S=octokit.rb-${PV}
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9
-	=dev-ruby/sawyer-0.8*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/jwt
-	dev-ruby/mime-types
-	>=dev-ruby/netrc-0.7.7
-	dev-ruby/vcr:3[json]
-	dev-ruby/webmock:3 )"
-
-all_ruby_prepare() {
-	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
-		-e '/pry/ s:^:#:' \
-		-i spec/helper.rb || die
-}
diff --git a/dev-ruby/octokit/octokit-4.19.0.ebuild b/dev-ruby/octokit/octokit-4.19.0.ebuild
deleted file mode 100644
index ca58dc925303..000000000000
--- a/dev-ruby/octokit/octokit-4.19.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby toolkit for the Github API"
-HOMEPAGE="https://github.com/octokit/octokit.rb"
-SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RUBY_S=octokit.rb-${PV}
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9
-	=dev-ruby/sawyer-0.8*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/jwt
-	dev-ruby/mime-types
-	>=dev-ruby/netrc-0.7.7
-	>=dev-ruby/rbnacl-7.1.1:6
-	dev-ruby/vcr:3[json]
-	dev-ruby/webmock:3 )"
-
-all_ruby_prepare() {
-	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
-		-e '/pry/ s:^:#:' \
-		-i spec/helper.rb || die
-}
diff --git a/dev-ruby/omniauth/Manifest b/dev-ruby/omniauth/Manifest
index 590b1ec533b2..84134c84704b 100644
--- a/dev-ruby/omniauth/Manifest
+++ b/dev-ruby/omniauth/Manifest
@@ -1,3 +1,5 @@
 DIST omniauth-1.9.1.tar.gz 26528 BLAKE2B da096ce924972c867ade4cde7e6ec90f5a7de41947f5d04ad092174baf3073ba6b235ff998551d9bbc7f6dfa2a4290eef1e1d962590591cf29f89395a554f3a9 SHA512 687ab9ad47d57d1cbe01fb7ed37754fecb3b75b7e62853070b5880ad6347a2834524a8d4042271ecd7f708ab35b7b5bd3203058ef03c3317f26f88a7639c2672
-EBUILD omniauth-1.9.1.ebuild 1193 BLAKE2B dca25cf4c30faa152389c8a90129d97f612171366fab6918338784b89c32586b95a47645c8b37d8e168a2fac57e963579ef1e82267a4e1981447a1d6e08b954c SHA512 17c389780b47c302f48dd1cd3dfc69daf3a2106b439147f71b9017e514e576f98656dceff996c776843a5475e72c6e6e57efb987633030c532014f9c505ca48a
+DIST omniauth-2.0.4.tar.gz 30951 BLAKE2B 6086a737e043ae37e6c7c4b1e4d597a08e6dc490c5d71f7847e9c5a8880bbbd1117470efbbe12e150bf238bf6e5413493712f1c09ae5e37f5d7b7676b6da023e SHA512 c92ce881388c9793e96354caee764cbabb28c69ca63b32f304693c4859eb8bf994e86b2cc9dbeb57993347e6f2787c43eab967c36730d5c47a3c4767d16847eb
+EBUILD omniauth-1.9.1.ebuild 1193 BLAKE2B f22832b72ee5a90f21dd03424417d79cfcf3ebbcd99a9e0aedc8d23137fb786b31d98504f04d489026c0162bf89199e3cc6836dbe8afa89c78744ec7045b54e7 SHA512 b39eca667bf83a141e1feade2f41e686dfb9ab37a9d9630e6f1ab62cf45632fa03e25076d86b368917275c1700896c3efa7e184ac50a151bb31418a67707a32e
+EBUILD omniauth-2.0.4.ebuild 1198 BLAKE2B 3bb4ae913e0bd7b9f6bff3c9c5a87dfea9f5d1dd26b3463fb3ef5e534516dc630bdc7cadf063750e5d9546e14b6b6d5652f8fbd13cdf3cadf53aeb6b6163e621 SHA512 de03904de0b34b0ff2f2e558ed2809610805fba843e89d0fbddc7f5a61e29f658a49c34418b1556cc08092e6999cfa277b7186295a4ffa68b8fdeb4e5a0bd201
 MISC metadata.xml 343 BLAKE2B eca1c20d937a878552be8bffd3394dc6a5b472b87a88f1ef2a096fd2ee75fe4feb343990c8e021bcc1144b6257175e2f8119ee374b6b551ebf19bcfc7860dd9d SHA512 189a7a11a84b2fa108299499e9f867768246b34237b74029eba64a0895d5c95d39544e340c4340cf50644f602411dfad991ff460c0269f1956061641e3cba130
diff --git a/dev-ruby/omniauth/omniauth-1.9.1.ebuild b/dev-ruby/omniauth/omniauth-1.9.1.ebuild
index d58ecb6d1b6b..28d880e64b38 100644
--- a/dev-ruby/omniauth/omniauth-1.9.1.ebuild
+++ b/dev-ruby/omniauth/omniauth-1.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/omniauth/omniauth-2.0.4.ebuild b/dev-ruby/omniauth/omniauth-2.0.4.ebuild
new file mode 100644
index 000000000000..79e5a2b31ca8
--- /dev/null
+++ b/dev-ruby/omniauth/omniauth-2.0.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
+HOMEPAGE="https://github.com/intridea/omniauth"
+SRC_URI="https://github.com/intridea/omniauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "
+	=dev-ruby/rack-2*
+	dev-ruby/rack-protection
+	>=dev-ruby/hashie-3.4.6:*"
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/rack-test )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' \
+		Rakefile ${PN}.gemspec || die "sed failed"
+	sed -i -e '/RUBY_VERSION/,/^end/ s:^:#: ; /freeze/ s:^:#:' spec/helper.rb || die "sed failed"
+	# maruku fails, resorting to default markdown implementation
+	sed -i -e '/maruku/d' .yardopts || die "sed failed"
+
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		yard || die "yard failed"
+	fi
+}
diff --git a/dev-ruby/pastel/Manifest b/dev-ruby/pastel/Manifest
index 9a92b6b4530d..dae826bc8171 100644
--- a/dev-ruby/pastel/Manifest
+++ b/dev-ruby/pastel/Manifest
@@ -1,5 +1,5 @@
 DIST pastel-0.7.4.tar.gz 48176 BLAKE2B 3564aba28f9315d2f988dabdd0686e6c7a53c1b200e6e03519c1ebcde917503760d4f0d790e456c7a732b47535f692d7f5b88cf786e5b4236e9b2e8b5eee66d7 SHA512 a1ad8487babd1e788282e141538855370e09bb2745731670b814cb4572c54e0568955108f7657809b98f92b94d9d94cdd555e2db8146b20f80db98bbab3512ea
 DIST pastel-0.8.0.tar.gz 49560 BLAKE2B 646cdf5f7cd1e62e83d87cdcdbbdc2cb2619fd570b4715191825344346053b7bf8f8f18b177a8bad6416c13858ab007d94ccf5c16b71c123e4a3d2fd03cd0720 SHA512 8066b372f08e1d6312b87744309692e3e6fd5e2737374bce53087af45141ea4f14e67ead6dccb11df70f73cbb0611ab9e20f7fb553d87a349996bda0f7a3862d
 EBUILD pastel-0.7.4.ebuild 770 BLAKE2B eb2478af74a467d8a9590019cf5e32fdb85021c80628759909872cbed943b5aa2dd1ebf19df6d9d82908cee489ec8995bea4333050ddb06e02bd4460eff9cd9e SHA512 fc0ba91e34d06dc2ccc92a4745a2c2edb9451dbca2a8f7644c1522fb5e9fb85d39b0a4bf74b5399ff6449a565b6f19f60309a075e667b7cc3a60d15578266153
-EBUILD pastel-0.8.0.ebuild 704 BLAKE2B 206c3722e5b4c8d894fd8a89378cc15fc74b27c055050c784645b0233561f5467b98fd56ee4667a58ed4a37c80b30405db3a4ff49d66bbd7ccb6a8b923eb9507 SHA512 74c35d4b772c263cd04a2553e6d839a6ea21009cdc89e96f14815874f6baf694bbefadb765f90383806ccd466e3f8d45b099d31ea850a91e9e87fdfc240b69f3
+EBUILD pastel-0.8.0.ebuild 711 BLAKE2B 8d5086e8aa2f4fcdb3835bf913c1f4f0942916d5246ebf6bf244c4ec7f56f9e7d3993f22fabc904332c0ef0f65a82794bdce99bb1e6dee6030b5f7c138681983 SHA512 cb3d9eed579eab09a593be6d297d38e6e7c03019bc98f7e4bdceb0d068d029da9f6cfe087383a8d61074eec83af5e573201ca8633a33e696ff520a83cbb65785
 MISC metadata.xml 334 BLAKE2B 2998a15f4351a2089d4e0cfe14c2b29826aa0028924409cf2ab674ff7ca27568cca16b6071907dcc9f31cf284d1356677a9634bf943771518840906379b6a7a8 SHA512 a0f32d3a71a2969b1bfe46736321ae60a4dcf7fe304c3729f56fa7ea56c159d9bfd05563a2549335ef96308fa740c7c1469d1c1fef444fb080a407204be5e527
diff --git a/dev-ruby/pastel/pastel-0.8.0.ebuild b/dev-ruby/pastel/pastel-0.8.0.ebuild
index 98bebd6f62cf..9418a00698eb 100644
--- a/dev-ruby/pastel/pastel-0.8.0.ebuild
+++ b/dev-ruby/pastel/pastel-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/path_expander/Manifest b/dev-ruby/path_expander/Manifest
index 810c43a8b6f6..3d91e318cd55 100644
--- a/dev-ruby/path_expander/Manifest
+++ b/dev-ruby/path_expander/Manifest
@@ -1,3 +1,3 @@
 DIST path_expander-1.1.0.gem 13312 BLAKE2B dca42a0e995d7ef87cef3dd26251ce378df33db557c5089b58f1130ed4c61b5521012198e381853c3583601d990aeff3a8463393e89e891b2ca9c923831ba31d SHA512 eebcd1caafba5c40512cc0c6e3419137fc169215d2eac77914419d9f3a6e200350d742b13953b2dbbdd532c9ef73e950c920017a4f178941c1e04ee832e038f7
-EBUILD path_expander-1.1.0.ebuild 718 BLAKE2B 03ea73d8486924a113f6363e0645e8f329d82af7b510400842d6552afa28faaecca2a09139c1f52b81269e64fe0cdfae91278a78267754474f83a9aa6ecc782b SHA512 78b32569fb576be12c7ba35b36edda61090e30546f9892dca42c3647ae5f06767c89f073545d21b714d5b9c6790a48571b9be8c55db1f7d749e101cd49f87e2c
+EBUILD path_expander-1.1.0.ebuild 725 BLAKE2B 4e4f0320203dbdcefaecbf7a78149896f148a295b49d0ada32ce996f68f6ec8ceb50780313454913638988c9fbd4cf0d0cead01b7d2cf80790a592fefd1f0de0 SHA512 d865259f48b5569adda5ec09efc6ba63ca910b6fe4d504e2d449bae72706ac642d91d62a5573d3fe8abbc9b07829bfd493ba51574b55b6a9d2bd7f34562fc7c0
 MISC metadata.xml 339 BLAKE2B 0503afefba8259d6bb24509f978237f90c06779a981c8d24aa86c03b817544f4f73745c8f97f999c2d8eb44e4a2a2d0caa99ddb944dcede89dc66218ae90ca4e SHA512 0e83915194d87e06cd7a0b26cc1543b966fb1b7e7c4d877523477ed0dcff9b9534c931e604b98fffe82298da6ee51c2f70a4d8834694ca19bde82eb6c63845c0
diff --git a/dev-ruby/path_expander/path_expander-1.1.0.ebuild b/dev-ruby/path_expander/path_expander-1.1.0.ebuild
index 6c8722ce1e1e..465b25df2d46 100644
--- a/dev-ruby/path_expander/path_expander-1.1.0.ebuild
+++ b/dev-ruby/path_expander/path_expander-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
 
diff --git a/dev-ruby/pluggaloid/Manifest b/dev-ruby/pluggaloid/Manifest
index fb81687e991b..4d0e1143f4fc 100644
--- a/dev-ruby/pluggaloid/Manifest
+++ b/dev-ruby/pluggaloid/Manifest
@@ -3,5 +3,5 @@ DIST pluggaloid-1.5.0.gem 19968 BLAKE2B 39fce1d3077a0d2b2b969c8a6b48850b0451e8ff
 DIST pluggaloid-1.7.0.gem 20992 BLAKE2B 8e5dca33d4e724ce264cf94d3494d452dfa6aaa3dc373c50ac7a5e1931358484e984bb0f3e170243d7e3daf10ba6a7e15b1e7b0cc77b6394c2349e6e36e7a77d SHA512 f4ebf9fa60bf29366cafeeab09cd1cddd3c46903757f55a6b0a1326499c1b5e917258eb07a7f95934ab2ff32626dfffc2738c847eb6090725f90dce7ac90c550
 EBUILD pluggaloid-1.2.0.ebuild 558 BLAKE2B 3503584a6126ecdd56f0715c57d6bb3d9902c5fc201cc1e883dd94e11219e5502b802b75f40ed92f1e9cb5ddac834c4a3bee1847aff5f29193604125dd9552a9 SHA512 5fd51185815ebad86f3c4b312c5e7c383ba99f166aba9ee65e98e5ea4cc84bfac45beb31db12b832f797ba896c0712ad4141676c0868b10d5fc9091dfffe5a84
 EBUILD pluggaloid-1.5.0.ebuild 536 BLAKE2B 5938d6b08fdb81537219c1d135e79a61832923701072e6b6473b6b6f7d170ec4954fe34883a84becf9147051628b042f76446dae683ad4157a40a50cf3c26f08 SHA512 63688f45ecbc61abf85787fe5563f2d98ac4078511faa87a0bee5b029913dd27c59d24412a03d51167a875e9f6579d0ac170aef33e8b6f3b69611483adff3724
-EBUILD pluggaloid-1.7.0.ebuild 536 BLAKE2B d9c8fb99412f232ec91cf15e9ceaf1b477e28e5d9a132a63d61ac1b7385c6b2ed503183adbe10b649aa54ceab307393fbd55c26f4c9490a0369f165477ded59c SHA512 fd7163ee4e872f58067dcd652daacf4d1103e7a29a1893d4d840c24c1ce63a4ef4853230e789d27889b708b5f27a850ed3cfb6dc4efea4cc1f3702a0aa8ff936
+EBUILD pluggaloid-1.7.0.ebuild 543 BLAKE2B c5f6b6a8d261f2f3a2b138d899104a27ee131f589ec4d9d52283ed8efe7ea1d4c5f46f6609897b1d177bc8cba6bd2db8b1848c9a03011434c6d90c6c9f024d6b SHA512 7ae5ac2ee3f7be06f52303ccb18a4e1636bc0044fbdaf64f7cd9b01f1595777f3c23ed52eaa9fe4b1b324c970f50e93691b83d98a372abd160ed9f9b8e574018
 MISC metadata.xml 411 BLAKE2B c4607d99d68dd5f206741e4021f2c8c2495468085c941aa66fb26aa356029b47ae33d1cdc16b07e256bc1bee58a92f5ca4599432a1b6e7e882275638fd02ecc1 SHA512 24dd8c687efe2f4b36b890912e583b7800151d1209b74b0676ec9c863e263e8858a9a9e465523680890e14243c8a2d67e7a999a1973bc5bb797cebdf886ae546
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild
index 56af59272b30..baab4b592530 100644
--- a/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild
+++ b/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/puppet_forge/Manifest b/dev-ruby/puppet_forge/Manifest
index 3d15e861d0ae..d9d78b6de709 100644
--- a/dev-ruby/puppet_forge/Manifest
+++ b/dev-ruby/puppet_forge/Manifest
@@ -1,5 +1,3 @@
-DIST puppet_forge-2.3.3.gem 772608 BLAKE2B 1bba9ce824019cefbcd4e28625c99855f68bc4d752f069bf84ff86c0f768dc8b795eaa95b76e340e273079dc2882abff91a2b44d0a6f280f541637261357508e SHA512 8e29d35b7175430a50d2da0b07ef3a9bd274df97f292e24c12a0d267257ff123df5380c0ba8c7124be21b4f4f0b2a11af0923e9fb5751683392c6d11ed6bf0e0
 DIST puppet_forge-2.3.4.gem 772608 BLAKE2B abb730eaf55a3c87a6f31b192e1efe6783895fad468c850f1e4e87d15dc8887b72571c425e81272c308e3ba9e94936f20b3ccbd22e670d7c111c88ce1acc1974 SHA512 f903f3ecbfdfe80b4c9d769ba1f622bf64cd723fd9165d1e3ed27296eb0e2e67f827fbc5faf460391e462cfd1cc652e573093dae29622726b3e5a37e01cf61ec
-EBUILD puppet_forge-2.3.3.ebuild 1093 BLAKE2B c223dfd183a043506e7aee0ffa34b8f9cb48fbbec6ef269949a80db05bd69ad716f5893d7fad1ceda15739d18427e4be7ca28eab2d11899c7806a3d438464960 SHA512 c3203a19563c410a7d0ed8617fa9dd994d37bf24e8c909d50be86a95b4bbdbec33a6271e0203d19d176d47e336d8d4f74e290f609c2cd4116a2d86970fb2b81b
 EBUILD puppet_forge-2.3.4.ebuild 1197 BLAKE2B d0bd4b7fbce37538b4967f26eafbdf5aa8b590164deb4b494285b058eaa52857da5f4ebcb05ac2926bca88826cf12acc0f277de18baf5087d2c8fd6986da7db6 SHA512 af205d5d4aeb3a5cb760ed7a9d14430acaedd9a4ccd10376f8ada201fd02e3e55c0d2e6d65b2f88bfb4b30fbca26a8202cff6f218e47aa6a55fb179e4f7cacdb
 MISC metadata.xml 569 BLAKE2B 5bf74b6873d2c04f51bf6d15214ef49b130f3e6beb765f2c60c0586293aa2ce5fa5300972ae398e5da98cfb92b1ae6c6a963b337cef8953ecdfabf8a7a4ba056 SHA512 40c90045712dab8d066fe6aae17e71effa89ce11551cb466158f4555e5c61705a0c03404c2bd44c6ae3e5b672ff911432b454f9d003c70a64998acbb8481796a
diff --git a/dev-ruby/puppet_forge/puppet_forge-2.3.3.ebuild b/dev-ruby/puppet_forge/puppet_forge-2.3.3.ebuild
deleted file mode 100644
index abdaf707c6dd..000000000000
--- a/dev-ruby/puppet_forge/puppet_forge-2.3.3.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_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL=locales
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
-HOMEPAGE="https://github.com/puppetlabs/forge-ruby"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/faraday-0.9.0:0
-	>=dev-ruby/faraday_middleware-0.9.0:0
-	>=dev-ruby/gettext-setup-0.11:0
-	dev-ruby/minitar
-	=dev-ruby/semantic_puppet-1*
-"
-
-all_ruby_prepare() {
-	# Avoid integration and user specs since they all require network access
-	rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
-
-	# Fix overly restrictive dependencies
-	sed -i \
-		-e '/faraday/ s/0.18.0/0.99.0/' \
-		-e '/faraday_middleware/ s/0.14.0/0.99.0/' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 3f3409b76725..be68673118e5 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,3 +1,3 @@
 DIST puppetdb-termini_7.4.1-1stretch_all.deb 21552 BLAKE2B df93159a7dc9f6a6735f44531306a2b1c7a1bf9d8b88dbd4c9784367e949a83b0cb42dd8172880df9e7f4cbc1d3bcf9da570cdf2fa0437e525452d1f2468551d SHA512 4ffdf5e2019400dbaa5bb1fee22fd66fa430ab395a42d25cca2c61feaf68168b44eb1d29c0a9984a2cb669eff4ffadd9f9c64c6c19ea21bd3ceead392ad6d26b
-EBUILD puppetdb-termini-7.4.1.ebuild 663 BLAKE2B 85e09da58e2c7ad55aeac75a1a641a3c26714547f6b488bea929ecc4336aac424b65c35dd37e24c53d517bcea6d22a4cee7471a824f3257e4b5b69e19559b94d SHA512 5e6417c98ae0fdf7e7f552086bb66814795df5583e08574a32dcac58f06e0b48b32775ea1925b953631a35b364ba219e3701a0a47ecf6100ff36518959048c69
+EBUILD puppetdb-termini-7.4.1.ebuild 670 BLAKE2B 39d3c3e8ec65d40e3807cfd36658711dfb27cde4b55f8848708bb40b85ee07b69de9a61bc29350d4bad1298179676fec40870a32e45ab3d831eac3d462715d66 SHA512 72fdb6d39a682c8228e2fb6141ef6af93d6773bf3bec50bb468499266e60f9a36fd8f5f2f26626aeb47ff5791de8e4c16f1cee93ccfca16c5ea78d46e6a2fbc2
 MISC metadata.xml 366 BLAKE2B f03ce821e0baae11d699365e190751fd1c9d233935e46d31ed9f19105ce6b66b1c4ef56697f5e5581022261e4b45bacd4f04368c3e6f74a12b15ee4dabecf869 SHA512 96ba26c725e5fd36269acc3556a7ad6b89d26010e376ff76cffd2a99481b2d3c9c76595f5ee4cba585c3dd7ac76e121aa4f7fbc0efa80d760748e9f81c998655
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.4.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.4.1.ebuild
index e88438205f95..759e7aabae62 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.4.1.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.4.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 inherit unpacker
 
 DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+HOMEPAGE="https://puppet.com/docs/puppetdb/latest/index.html"
 SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
 
 LICENSE="Apache-2.0"
diff --git a/dev-ruby/radius/Manifest b/dev-ruby/radius/Manifest
index cf5681807039..bea428aba8f8 100644
--- a/dev-ruby/radius/Manifest
+++ b/dev-ruby/radius/Manifest
@@ -1,3 +1,3 @@
 DIST radius-0.7.5.gem 147456 BLAKE2B c62c06196bc42cd83b7d898744fd655c3332d14348318974de272491eb823861a650b5466958ea5e0b7be2a5a119c75a75a7e6c53975d7099ef1c45d912c7595 SHA512 2e1f94c45bfa23ffbcbc00b7dc6be04d4f085e513554e7a6c4193270ae2bc2ef952dac72e4995b6f7ce43e92363df3ca7e7b183758ccd1f8aafe64f82cacb074
-EBUILD radius-0.7.5.ebuild 579 BLAKE2B 7b268661366be6a834c30a0fcb0cdffda7ef63de8b39815c9d066539d3e3becbe892126dd66b3f981f15602ee0a5c3d9158f18328768546561a2712a9492ceff SHA512 0d0941967952b99dd10eca5f36abf46e8753ff425a0a2c05a3a63a2068f88dcb6c64a4bfdd00b71dd887c8681d39291b88d59f8e7951ad5993eb6588f17351f8
+EBUILD radius-0.7.5.ebuild 572 BLAKE2B 7cf953f5e53f9adf2f5d982f25a42a77876d42a017a8beeb3c296d9fcb0cd97676c66b1566c576fa72862ec77e74299d5bc9293909091dc736bd48509416e652 SHA512 bd34e2f994f59c477b9a2f0fd49be8473dad759cc41038a3a05f93f73919af71e145e61ca9f1d88e194e0ba54e03adb9c6ecf55d568b192d90e311266e2265c6
 MISC metadata.xml 338 BLAKE2B 9f40be1812f1b5df68280d3d0215238442df3ab392f054bc4394aecd1bdb688b194c40ec14d30ddbd5cb93890ce0b6d01b514e46c1451167fa10883aeae70f35 SHA512 4674778d8822f53f2a50ab0ff42d386d4e3fadd620747ac2c8bf6833669025076486b01b105ef15168cdc4c303c324d7dc773c94fe2e31bb343aef51e1a5c80c
diff --git a/dev-ruby/radius/radius-0.7.5.ebuild b/dev-ruby/radius/radius-0.7.5.ebuild
index bd53d86afa98..2e5b5ce625bb 100644
--- a/dev-ruby/radius/radius-0.7.5.ebuild
+++ b/dev-ruby/radius/radius-0.7.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG QUICKSTART.rdoc README.rdoc"
 
diff --git a/dev-ruby/rails-dom-testing/Manifest b/dev-ruby/rails-dom-testing/Manifest
index 10270df96724..944083d78344 100644
--- a/dev-ruby/rails-dom-testing/Manifest
+++ b/dev-ruby/rails-dom-testing/Manifest
@@ -1,4 +1,3 @@
 DIST rails-dom-testing-2.0.3.gem 14336 BLAKE2B 8740433474e88a7cb5be14b4357dd0b69d45a39972136cfe9a4d695d2478b5b535e2b407eb0acc9ec3abd633cb1f8591a634abe6eacd8ec38bba865ad32ed92e SHA512 910549bd42e6651b7160af0a4aaffbbdeaee829aa7c3f3552a73ba985ef1230d5586f5bf723018f2cd8c6d5c6238d045a8f3e686704b6989e5a56664061f6c72
-EBUILD rails-dom-testing-2.0.3-r1.ebuild 663 BLAKE2B 83584f644f17bf07f1cde61c2b6385ea7c1c38a5fdf536897acc0e08216b8287bd114bab80172bd378e17c1755e546182fbdb06f659273286f2db1e87210fb53 SHA512 55873c9264bbd7942c84917ea068ef2f1e9b0e2b0d02a73fc820f2035d345472c8c2342e3943ad67cabf65ff4f05767ddbd3d8ff4ccb2166b42a296c8d1212aa
-EBUILD rails-dom-testing-2.0.3.ebuild 662 BLAKE2B cede5ce79ab7f0094f1610fabb1b57548de8bdf835f8a11529fe9f4858b93a52d4e55883c725916de14e0cd2bb8b7b78c8423fc54cbb0bb6b7d8dab07ff4560e SHA512 abb8090adc6c48d2b86eaa7c7ae47f99e53d36e74ac3afafdbaa4b5a898a1610388b9991e97b39aec715c71c30ce0af7927887dd1a5e1667c87d970e075b3a6a
+EBUILD rails-dom-testing-2.0.3-r1.ebuild 662 BLAKE2B a8d32f001429c50856da0eb3325bec203b8b575fd2ef3b203813419b22f4f48b58db50dde5dab147ed7833650c3a13a4ad5687b7285e9915d8d4ee180274deae SHA512 76722d9859dab25c0ba934b4e15dfba5f21395728e1da0a85e68346199eacc0504f1d698a64291b1c454330aa378f1ac14b63133745f3cae7b73749b13582b9b
 MISC metadata.xml 350 BLAKE2B 1c2caa318832438e9f00f976edbb95493e9313ecbc0b481cb1ebcbdcac1bd9068eddf8ef6e7becde15efef1e33c6a83a5dcb9b5e20863a6081f10faac65d55a3 SHA512 a0ed76fb694f21c179472ddc7081b3114f9762c65b98cccb47c419dd7626701cbc111205dce3976d54f0fe5811a256da4edd2862bbf075aa62dcc8cd4fbcf21b
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
index ef731c8a8e82..a39c32c9b93d 100644
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
+++ b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3.ebuild
deleted file mode 100644
index 8cdcf4dde98a..000000000000
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-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="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-4.2.0:*
-	>=dev-ruby/nokogiri-1.6"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rake-remote_task/Manifest b/dev-ruby/rake-remote_task/Manifest
index 5fc783d70371..7e028f0a521f 100644
--- a/dev-ruby/rake-remote_task/Manifest
+++ b/dev-ruby/rake-remote_task/Manifest
@@ -1,5 +1,3 @@
-DIST rake-remote_task-2.4.3.gem 18944 BLAKE2B 65105ded7e7c98f13c33376887220fae849a0077fa05d65f17079512f1290b1049373d130b50c756523c1562a7fdd608cf28d7fe32355ce4b52e1e09982a6b98 SHA512 0c81a4156853e6a58c094723eb5748a6aba826c62624c9a04b63e505e8c4bfab1b8fdfb80c0d28d6ab84e6a06280c52b263b515c17cab9d248d1eb9abbe78ac8
 DIST rake-remote_task-2.4.4.gem 18944 BLAKE2B 3157d38346cbefe1ac522fe3d33638e65c44f58bb35ca822e5e7eab5988abbe0ed788ee22ac6f7ec2b104c72145bbd4d259effab7c2d6584f688d1b5055aaf2b SHA512 885cda1754c2f8e4a4f2ab4d688bdaf3f06924f8d5e491b9cbd61af39373a95884d2cdd78b0f964e69941f56bf0a1dac0a586cd3c7fb729fcb96ecd37715ccd8
-EBUILD rake-remote_task-2.4.3-r1.ebuild 672 BLAKE2B 2481ca698b7128261380bb639bb5305459e2cb5ae7dd3d177b4d9e9771cc1add933d7b4529730eed48fbe1cc3b095bce4aa3c8100263e2bdb93bab935311b916 SHA512 c7de14e66f2dfa21fecdd0b536695219de8a880d2abfc59986dd1543b4b16e273283a2bbbf5a9f8e576a3f9355dd82ed52adc0444940bb4096a2e46492521460
-EBUILD rake-remote_task-2.4.4.ebuild 665 BLAKE2B 08f4b03df26260dfcab313f3f88ac049569a66cf5b55f5d5c4069e1452cc6eaea5b7e853f0050ef03b88ed9078b70206232c5feca61a23e1d2a2963673ef5b9f SHA512 984a6fb7bb6b8164af703b51b89d831283863eecd3cb47948590bc56860414a61f2c50ea0c9f1a0fe261745e8bd9af8ca9a170666955bde4006ecc25e99e2e84
+EBUILD rake-remote_task-2.4.4.ebuild 672 BLAKE2B acfc6fd665a4c8eb6d61f366dc027f6087ca0e7db0218dfb0d54d38e3fa99f27028d001a831affff6a7c1dd730a72825d0220eac7d8d1e6d4cfb29e7edf378c2 SHA512 e4e031727e2c9e8510bbe2bc1c019b81b1b9f04008eb3b14d5a57b33051ef056174fd2c011f9e4c0ed38ffbff89c640cb00b4a3cbd79e210af8281b9650e0fd6
 MISC metadata.xml 342 BLAKE2B 4f6b92bcc6baa146724b53d4c522b5969563ad7b46828a53dcfbbf42d9d46f8ca90d8360db0510fb415fae146405fd2bcac1ef2244b2ff1e11cb10b7afbffa78 SHA512 0779574f4a7166acd5b5228f0bbd4353a79e4ca77f2d9b3f79221df5cdef3390941b1546586d49234b12b28c834c652dbe5d05e63ec0eefaf232cf3748959b98
diff --git a/dev-ruby/rake-remote_task/rake-remote_task-2.4.3-r1.ebuild b/dev-ruby/rake-remote_task/rake-remote_task-2.4.3-r1.ebuild
deleted file mode 100644
index 93a9022ff549..000000000000
--- a/dev-ruby/rake-remote_task/rake-remote_task-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Extends Rake with remote task goodness"
-HOMEPAGE="https://github.com/seattlerb/rake-remote_task"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( dev-ruby/minitest )"
-ruby_add_rdepend ">=dev-ruby/open4-1.0 >=dev-ruby/rake-0.8 <dev-ruby/rake-13"
-
-RDEPEND+=" net-misc/rsync"
-DEPEND+=" test? ( net-misc/rsync )"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rake-remote_task/rake-remote_task-2.4.4.ebuild b/dev-ruby/rake-remote_task/rake-remote_task-2.4.4.ebuild
index 43c5e8251d9a..75dafd1c6c79 100644
--- a/dev-ruby/rake-remote_task/rake-remote_task-2.4.4.ebuild
+++ b/dev-ruby/rake-remote_task/rake-remote_task-2.4.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
 
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 22eef0cebd77..9a4bd7598442 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -1,11 +1,9 @@
 AUX rake.bash-completion 1335 BLAKE2B 5f4b81b850e3435246018d7bb420263647c11573657cb7362d95727800f4197a904003b5a967cf0df862edb36af02d640a052b5ad33218d3bd7a6945302ebf94 SHA512 bac238c0023e525570dcb93c2092059b8a952ed54bd97344db8011f89720af947b840564701b75e03f37a6994f27da95d8f44f1fc28839c8cb1d735cdedf07a4
 DIST rake-12.3.3.tar.gz 122233 BLAKE2B e6c913b833092ef5d4203265bb5daf725bfc34ff3abef5a4871845ba9ee322bb8ec668564ed7fe5a2d9ce219d5b7cb00fa22d0b76fb9721f2138d2d963f16c22 SHA512 de15ea4428e845de214d35ad2155bd55cab51354feb5c7ae4c2cde5365d7a3959ee96d913346bdafacdb0542ab2d0e4c2e905514a7f97cfb18e630794bba3a3b
-DIST rake-13.0.0.tar.gz 122378 BLAKE2B 996990f061a2604bf031926670043773b029d03e092513be3566763b04474d88b9bd05c085f25fc9d66b26a55e191b45fa34dc4aa215376703ad28750d71a6b1 SHA512 56038199fedd952994459967173d298afb13ae7fe9d7873dfe18cd4030b37f841ff74c944835843379cd66da96a6d1ee8c38294203f9d8e514c4331d65f5db79
-DIST rake-13.0.1.tar.gz 122821 BLAKE2B 698e92d32d4bedf523bc81636f4183ccb11da1f467d116f7ff4978e121bddc41b66160798e2c0a2b00aa8f79171a81df7e214e556adeb386bdb00a72a18b82b7 SHA512 50d82b3a9bbe194467c7669000ed9dd8e55fbb22307fbc7180aff6ab77095108a2519b3095965ad08b52cc984d0384016d7b166676f2e97394409a069d01545f
 DIST rake-13.0.3.tar.gz 122825 BLAKE2B a36cc6d8e5f560bc502455a756b89d763899e71b711ba6b11d17fd86a460b4cb3ac47705645d4ccbaef9b6d8964cdc5d4d535b4470582cb3658016a399f78d58 SHA512 aff09bbfa58620cd6902e6679ae3f54d90424bfac40c7ad6efcc590a1c9624ae7a0c5597b8b05b378d90e422285c41d781485b9aebe1819c0c2eaf5f2624afa2
+DIST rake-13.0.4.tar.gz 123399 BLAKE2B f91079b3e22f0b1e09857ac5f549ad1cd4372ccbd2bc152e1ed57241ebf05e8605992008a6f7e4f172f7a0fd77450092b9d03e7026e3cbba25c52731d4aaeb57 SHA512 78533cc966cf285ba5556645cc674affb41baa3076e873055491c5700c6b2301b2da8ec212f260a44d2fe83003bf84b12cd2b81775fc354c89e3fcd346030bb9
 EBUILD rake-12.3.3.ebuild 1263 BLAKE2B a866e416a95844a8769325352c83f439e6cd9eb72ea586ea62881203fe99b4e4b6a81553e32f3396321907a2595f789782440ac96bc87196f1ed4d32215a6cc5 SHA512 9bf0bbe94d8098e3bceb3a29f67b1779d089c81a4f0b0d978460d8c44792484c3217c62ed8d5c48ee96745d59e68221d0bd91f02253cb748187158dda722f0ff
-EBUILD rake-13.0.0.ebuild 1440 BLAKE2B 3cd568481985f897a051329b02fbd011327cb0b0b18f3c8e5c6bdcc29732d00403e191f5cf09affadfd0f41b062aa36b4039554506e2681b012df12fe9794096 SHA512 2130e165851c685a59be81b45511ff689296e76d8bacb3dbb504bc35fc461dcc2cec76f5055d9889c4a6c08d82229d84a495e61d9df0aa73cd6fbd26f6d95e9b
-EBUILD rake-13.0.1.ebuild 1447 BLAKE2B 877bb61e85fb6eaf829142fd0f68176c1ab9bc947d2bd0da4b6d6c7f21cd48afd0cc307cc44e322c5693892ddf4593ca736f5e45b9e0766e766f13550ae3ef3f SHA512 54be8b3e195f8960844b38ae3171b50ad73ee71a8903e24e2eda6df2a7b49a523d1c67543e892dd42d2caf424381ab5e4930a75e2140af81dc6a152c8b5b8bcc
 EBUILD rake-13.0.3-r1.ebuild 1455 BLAKE2B c08d008ddd4c9fbbcc0bccdbeec69cbdf74eacb0a35a5f2440ee09ed4f02f926c6b15251f8ae3aa6a9fc4a8e70ae85c75505992acf78edfabc17442efab0157a SHA512 d0992df412ab18f7d724658f226c5cfded487417b0d27b44b3cfe6301da9f4a584de6a5df862c5fb1d079ae0f9945ee440b539d85918941ab14c4a5f1775cea4
 EBUILD rake-13.0.3.ebuild 1447 BLAKE2B 20142be6848ce363e150b6d3b36611e99077794de5ee4ac7e22667e70245252ea5ae2c44243f1146405971ef31fbc74ae119e22e006e89e1d1c4bee894565db5 SHA512 7e6d6b6e16de8ebfab69c887d65751aff7c5902a3975bd99882ee060a0697391c58edd1c073d799aeec8fe0481d6e19bbad70b2116bb1ca67e6bc27e30a60158
+EBUILD rake-13.0.4.ebuild 1488 BLAKE2B 81506dd9027bf056da28aa18840319ce3502057ae76552bb5ab465929c9d9c7da0da84ef1f4fe61e22069667dbfda47a9081b370573f3d7ed9351cc8558234f8 SHA512 45f5cffd067f5c2b4d6429dfa18e17fa4ee9a10459260c9780f31eb66c8960fdc6c0655ebcb443959e9aed21cfea9dd7d73c3a5b2dd2e94e64d8a228338a0c97
 MISC metadata.xml 341 BLAKE2B 4f6fce5484dd3adf4b7025f95d26ecd9f2f435d2b5e5774cb3f6ea2ea07727d4d76ef640eb039aafe67e5597b70d22258d0f8f939471af2057f0f933250098e6 SHA512 56fc95931062163036dde73847a796fd5802ff4bcb8a8e72686847537d0f38c9d15e0ec83bd06c2f86ce92952e9fbaa0e90eb4633d7afc460adbc0c9676e0040
diff --git a/dev-ruby/rake/rake-13.0.1.ebuild b/dev-ruby/rake/rake-13.0.1.ebuild
deleted file mode 100644
index e6e0aa0764c2..000000000000
--- a/dev-ruby/rake/rake-13.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rake.gemspec"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
-		rm -f html/js/*.js.gz
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dodoc -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/rake/rake-13.0.0.ebuild b/dev-ruby/rake/rake-13.0.4.ebuild
index 7b475131353c..0ac434efec60 100644
--- a/dev-ruby/rake/rake-13.0.0.ebuild
+++ b/dev-ruby/rake/rake-13.0.4.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="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
@@ -30,7 +30,9 @@ ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
 	doc? ( dev-ruby/rdoc )"
 
 all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e 's/git ls-files -z/find * -type f -print0/' \
+		-e "s:_relative ': './:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 }
 
 all_ruby_compile() {
diff --git a/dev-ruby/rash_alt/Manifest b/dev-ruby/rash_alt/Manifest
index 69d4aad4735c..eb43dc69afef 100644
--- a/dev-ruby/rash_alt/Manifest
+++ b/dev-ruby/rash_alt/Manifest
@@ -1,5 +1,3 @@
-DIST rash_alt-0.4.8.gem 8704 BLAKE2B 18a54fbff13942d9a0590e3316a1e783df05c123997162f1f1bcd0b72634eeab266288d9f14a6edf9738a5fb44922d03813b3f2d6cc1e147e8dafe25ce9424a9 SHA512 b32281999a662f77b52918926a265eb601db7f7322848701b0da8aae497a573ad668fbb1241676848c04ec26dc4ba1fc1bd7780b167bc772291a5de73df8c389
 DIST rash_alt-0.4.9.gem 8704 BLAKE2B 8b0fdbc5934a50e161ae1732b915dff6c8264ec6e3b2e2905ab3c5bb23174681bb12a738a8b43f1fffee9c1b39ca0dd0102b1a703ee769a8bfa1e4ed469d291f SHA512 a00cd979386b98e520bb09e9f866f0865b0213d67647c52acf0eb007aad0607d47fd8017c809d1613b6c9e94317dfafee0da7892301212209b27245de472116e
-EBUILD rash_alt-0.4.8.ebuild 649 BLAKE2B 288c9b440c7cda59b5af4c2441b6d418af5d94710e7cef8d56569abed6bafba70c351cccc72b0d593c72044e4ff94d2640f098a868a5dbb607630e31ca47992c SHA512 1b208230c61b49da1ee23246cc9272b7c53d8d6cd6879542fa93277d7bd12a6307cfef171a7a224466728495e8c64b598697f55b7c1418e466d774974b841551
 EBUILD rash_alt-0.4.9.ebuild 627 BLAKE2B d42c526cc5fe1bc851a56fe46c9149cec888e863d89f63619e096f07690f4c01351a0daf089d48b5d284b7e2cc4878a2415aaa893f9f1960d33ac7a71251836e SHA512 d44772286416c47b7f519cb681abeb74aa0dd12b416adaaa22832a1eaa295a2a657fa39f38929f4b3075a748773684c3de2636c3d1a1308002cc2552cccd2f20
 MISC metadata.xml 341 BLAKE2B 7caa3a250886847a12aa991c5dd47543d1e7189180f8174dadba5acefc1038284bd60edd162bd597658df0c1fe570abb4e46f7e3e0132090c14208b0c3ac1ff5 SHA512 d194dc7d95ed207f9022e3602712d942f592b3aa773796a1cbd14fe7d5d80d82ba767ebc5dd5fc9e5bac665459f4c624e0f074112ce35fab935a94ec383a4d84
diff --git a/dev-ruby/rash_alt/rash_alt-0.4.8.ebuild b/dev-ruby/rash_alt/rash_alt-0.4.8.ebuild
deleted file mode 100644
index 3b8c70513259..000000000000
--- a/dev-ruby/rash_alt/rash_alt-0.4.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="rash.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rash alt version for Hashie's own Rash"
-HOMEPAGE="https://github.com/shishi/rash_alt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/hashie-3.6.0:3 =dev-ruby/hashie-3*"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rdoc/Manifest b/dev-ruby/rdoc/Manifest
index 3e46b5ea62b4..941f3ca7ceaf 100644
--- a/dev-ruby/rdoc/Manifest
+++ b/dev-ruby/rdoc/Manifest
@@ -1,7 +1,9 @@
 DIST rdoc-6.1.2.tar.gz 667607 BLAKE2B 4857bcf5f72d93fe4e9ea89acfda9ae82afd61a7ff501d2eea529330d2b8a63d7cc775490648fcff5000ee60417123244518f56a31593af8efccae8f925b21d9 SHA512 a54e36adf9f98117f0b5ae4490a0ab1ce12d9b1de5b7c61ffa326b36ef13885bb8f18147f3548f95a285b15470faba14965bc87088fa3ce584928d8ee396689f
 DIST rdoc-6.2.0.tar.gz 668152 BLAKE2B 9c92b27c427d6229778aba54ce7f12fe883fd3e40151f518f3d023d4f6dd10d4f1f6d05c8d6bcdce80d1ac81ab25cd99ccbe9479a4fcd950b895e14d4fdc4b83 SHA512 15352889833436c0a243e4f79c4ae8113fa3b8c222950baf1fcd272773a7a17198c2cd91a50c92e225c282a37ec743a38d8e9ca4dffe0b66c39d56412fe56ca2
 DIST rdoc-6.3.0.tar.gz 670538 BLAKE2B a7eda5d588c0089e36ee4197940e762e378de24b45435f8d9fa9ef9292b5d2f50d7b48ed40764794c4a20e8b159ab6f2e0d86a9289c0706744eeec7a016e05e6 SHA512 7e5da42905416d12acf6528b5725ea9fccb7b50bb1ed95c03975d16cc2ad22c58f48c3f14b4f118deb978649cec184b98ccef915a5cb4b0321e0114438f75745
+DIST rdoc-6.3.2.tar.gz 675963 BLAKE2B 1ac931ddf0af700f2460e415a6e8c505c9a3c0f2d65b5c25928285144181d925747dad0224f014abdc1680df9130df74ba82750a2cb1d02b042c0bcd63d22e6a SHA512 1bd8eaa6c1e5cc40492b1d6e461d831cfc05bf368c982f3266b63ea4984c10de40523f9e2106b1beebd96933a2006cb81c3daa26ee0196d99d1ed6da5b72a78f
 EBUILD rdoc-6.1.2.ebuild 2636 BLAKE2B b7e269de9371299b8c7580e928e48f250a417120553d1f3520ec0a6e590d3bd55679e0fbbaa2a7e9de2890ed7c4bd7e58b70ceaffb4df5daea47e255b5feb4b9 SHA512 8ba41314f28de3f789fc4f527092ea2d97115b198a99ff1c38edb6ab6b2ca62ad3f0b71cd435335fd7589481d90e2c2fc133d72b096a91ac0bc15b2d52d3c15b
 EBUILD rdoc-6.2.0.ebuild 2671 BLAKE2B 9cc8cab8754a6bbbb7dbf9ed895c2c121318c706f5a835fd7dc4914a282a81344d09cd49d241294723cab97edcd87ef44ed3effdeb8463a23f6159c8eaabea15 SHA512 eae8875f7f2e4ddaefd8bef638e3a5d75b0f9d95eafdfff8e3cdddc18083e6ef693b7411971b090f3ee71f879042746f7687bf42b64d3c983a3a1adfc3f3ef87
 EBUILD rdoc-6.3.0.ebuild 2671 BLAKE2B 2d9f41f99b60bb989064d99e172793674310c732b603a57e4bbe081194efaeda6829cc65e2edff330520ee2e3791a650c48161d81c750a34589bebc7937e0b68 SHA512 e5817665513852fdbe44ba30d73cc6bfe953f76abddadb8ca3e609fe7918530b86e268baeed69004354f129957226d79ae05a4d06a5e1ac4cbc853f3c2a85bb7
+EBUILD rdoc-6.3.2.ebuild 2673 BLAKE2B e866918c3801853e48cb921fe752d91c21ec79bd49c254b7bda9fe839a767d6a1da4ea30a9f4c65b7e5607044e8168d4ee59b67f852e44b4e89c3d52335b8adc SHA512 7ff60a7a8e8a74674709a19a03f22e38ed940c8946a65242242bb94784d4a5acfffc76375db28f478e0ab91b55d13660c5f5ff702d1a3c3a362d0551805440d9
 MISC metadata.xml 335 BLAKE2B 835d498407155ac5295c70af8a671114c777e5f9371b3d47f9f92a6b102b8e1d58755df0737c34820630464772dc001163e83b5d319707a1c630f4cf2f9ef8de SHA512 3421081016cb99570f9ce9f775097669cd40a709efbbb3c76a20947717bc40d886195a5fda889407d1c436a387c126e07def1eeae01edff53c490ea9c630e992
diff --git a/dev-ruby/rdoc/rdoc-6.3.2.ebuild b/dev-ruby/rdoc/rdoc-6.3.2.ebuild
new file mode 100644
index 000000000000..f0396313bb96
--- /dev/null
+++ b/dev-ruby/rdoc/rdoc-6.3.2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
+HOMEPAGE="https://github.com/ruby/rdoc/"
+SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Ruby MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND+=">=app-eselect/eselect-ruby-20181225"
+
+ruby_add_bdepend "
+	>=dev-ruby/kpeg-1.1.0-r1
+	>dev-ruby/racc-1.4.10
+	dev-ruby/rake
+	test? (
+		dev-ruby/bundler
+		>=dev-ruby/minitest-5.8:5
+	)"
+
+all_ruby_prepare() {
+	# Other packages also have use for a nonexistent directory, bug 321059
+	sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/rdoc/test_rdoc*.rb || die
+
+	# Avoid unneeded dependency on bundler, bug 603696
+	sed -i -e '/bundler/ s:^:#:' \
+		-e 's/Bundler::GemHelper.gemspec.full_name/"rdoc"/' \
+		-e '/rubocop\/rake/ s:^:#:' \
+		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
+
+	# Remove test that is depending on the locale, which we can't garantuee.
+	sed -i -e '/def test_encode_with/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	# Remove test depending on FEATURES=userpriv, bug 361959
+	sed -i -e '/def test_check_files/,/^  end/ s:^:#:' test/rdoc/test_rdoc_options.rb || die
+
+	# Remove tests for code that is not included and not listed in Manifest.txt
+	rm -f test/test_rdoc_i18n_{locale,text}.rb \
+		test/rdoc/test_rdoc_generator_pot* || die
+
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		ruby -Ilib -S exe/rdoc || die
+	fi
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake generate || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	for bin in rdoc ri; do
+		ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
+
+		for version in $(ruby_get_use_implementations); do
+			version=`echo ${version} | cut -c 5-`
+			if use ruby_targets_ruby${version}; then
+				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
+				sed -i -e "1s/env ruby/ruby${version}/" \
+					"${ED}/usr/bin/${bin}${version}" || die
+			fi
+		done
+	done
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/rdoc) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+}
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 9555bf5aa687..5030d10f7e58 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,7 +1,9 @@
 DIST rmagick-3.2.0.gem 1950208 BLAKE2B 5d4255fec8fcfb8ec2f6f361fd54a3371935dbae323918b2fe1aea47645f160024a8dd16582acf5c930639a50f702b2062e475d231c3bb0acc0bd83ac9ea00ed SHA512 f6f15b013699da5c61e83ecf4ca16d64e7e2f447dc721c7db55cad6b880f9805eb8bdcbf70aef3e30a82f38bbab8ca093d8c6d2ce761cde4f47209e3f99a9f16
 DIST rmagick-4.1.1.tar.gz 1978761 BLAKE2B 489d355237379b7efb5e1d82b71cb2e6f8607cd644933c4d1d1116f464604262388aaf8534ed322c6b44291aadc3abb75e1bca94110c01fcde228b6fd9bb9ab4 SHA512 08d5a730281e7aa44fa955c8af06649efc77702dbc979f5de34f2f3b39798d494a0df8860a25746d89256c7ecaeaa140e4e5d5cd60017ed4412075a790976a5e
 DIST rmagick-4.1.2.tar.gz 1978867 BLAKE2B f89aadb3d0dc5274376c2fef335cbcef3bdfec3fa9aa2f9e0d1982c9d2b5568689a427c3b2f7536c0585316c0f53ca7111c3da30f8136df4c878782668830847 SHA512 671ce8ef0d2387d6f0091a7a7a79a5ee9a5c5cd9340f5d29b4a35227c2293eae5e0e5c9ef16a83dc24ed0cb59cc7258427f8880484f7bb49dfaccb00d280e2b4
+DIST rmagick-4.2.2.tar.gz 1984143 BLAKE2B 8b8119a0002c48f3a289f72d4bbea6ac86cbecb287b34ddc14ca126fd2d951a34aefa39d68603dc4c9de674d346e47ef9e3b2c8ed96a5bc081373a4184a3ec40 SHA512 0a6a30a631786ea310d2c8add297abd527588be755d021143d6c64fbb597006aefef859c374604f8d26b0f8b1f6cd8a5f1cdd6489772ee713c71681f3980c7fd
 EBUILD rmagick-3.2.0.ebuild 1571 BLAKE2B 64042d8dca87fbb45cbbda5027238f514e3b318e8411bbc5533d69c1f363a29929059a3ece5feaae36addc9e2da64ea18329315a6b9dd2ccf3fc2c4d1b8818dd SHA512 bae5e087c94971cb2e5c5b1e60e72fbbfde68e134166d1ecd8b2f75deb61d2adcba6a43bc345f8395cc699c798e68ebc5b6d9402fc18ba9a4ba768de7551a5e7
 EBUILD rmagick-4.1.1.ebuild 1800 BLAKE2B eac789a51637261d6f46e3a04fffd3cb44cbc1a9d047c52720e2567905947ef91e23c381191134350c73f7684bc79615d064b54df1c219ca12f23fc5c0531da0 SHA512 5414a49a468403137b17f313b4d5823b4c69b7af2a13c048371aeea15578854c23e705834d771c9d0948467d70a585f025586079bcb60c5f953e8eb139ec582c
 EBUILD rmagick-4.1.2.ebuild 1815 BLAKE2B 28b551d3619913b9a89e3b3185f19959d82ad4f1536befbded1c96afed760aed4c52b9095fcfad8d7a2c2e73dc54246211358fcff459d9096996c8b04cdb65bb SHA512 8d3eb2320c6f37bc65dfdbbf2b19498132e85024544728ed0a9915db12a950bf21505bed98d6f75488e13dcfd0bcb9e42563bf0fe7e5bfff5b431f08f35b06d8
+EBUILD rmagick-4.2.2.ebuild 1841 BLAKE2B 512fb197aa4b20fde46b673279909f0bd5d37d317c7ef6703cd2718862ff7a0e78539c8c4fbdda844330d0518d1fd28595834ae286e0316fa595a681ab837283 SHA512 23109024feea6353232b9b3a0b4e5e964071d0bf81b7f4e045cd4f80978bbbd08d6bffcb04d90d25cb56f003c70682a6cbe5055917fc5821228f53dddbeaf511
 MISC metadata.xml 341 BLAKE2B 537583fa385971de2e8ae510c7d32f11bf7644b3aac908b482833d26a2d92060255c2f15afd229c6c50207e969cbd5857705850440949788a6fac7329f26c757 SHA512 84bb956a38056526fd173c3f4aa972ea121712c15111a35e19e1f27b0cc797ebda4550ada88a46de7e66e058a66bb92d2e715d646068779843133a66d7523683
diff --git a/dev-ruby/rmagick/rmagick-4.2.2.ebuild b/dev-ruby/rmagick/rmagick-4.2.2.ebuild
new file mode 100644
index 000000000000..e5842e91c1cc
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-4.2.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
+
+MY_PV=RMagick_${PV//\./-}
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="https://github.com/rmagick/rmagick"
+SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="rmagick-${MY_PV}"
+
+LICENSE="Artistic"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
+DEPEND+=" test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,webp] )"
+
+all_ruby_prepare() {
+	# Avoid unused dependency on rake-compiler. This also avoids an
+	# extra compile during tests.
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' \
+		-e '/compile/ s:^:#:' Rakefile || die
+	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Squelch harmless warning about imagemagick installation.
+	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
+
+	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
+	sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
+
+	# Update version number hardcoded in tests
+	sed -i -e 's/"7.0"/"7.1"/' spec/rmagick/image/channel_mean_spec.rb || die
+
+	# Create directory used for a test
+	mkdir tmp
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+
+	if use doc ; then
+		docinto .
+		dodoc -r doc
+	fi
+}
diff --git a/dev-ruby/roadie/Manifest b/dev-ruby/roadie/Manifest
index e322948fedc0..d651cb600d2a 100644
--- a/dev-ruby/roadie/Manifest
+++ b/dev-ruby/roadie/Manifest
@@ -1,3 +1,3 @@
 DIST roadie-4.0.0.tar.gz 50727 BLAKE2B 671c5260f4a181e4a50d136e4c6e96e96a3bb51adc7cd88d070b558af0d1d858e712a8f6d586aaea5c72b735db41a54ecb1833b74b3e76f7838a3323a69fb5f3 SHA512 ad42ff83c7983e8cce1506f6b72d66e47a860251749eebd3cd65c2114859d3d8a8103d309964aa53875cb07a83393b086fb6c58db88d95a84059abb514d12665
-EBUILD roadie-4.0.0.ebuild 940 BLAKE2B 50b0bf2e700cbd1b3907b53cde851237158df1bf9c92c650ad2624039d81f2c95ec75b9da1a167941fec0f000f22f2fcfc4c5bd66bc54508eaea303108fb0d06 SHA512 dfd81ff22115c9db2297231c4d843937248bc0b7b1bfd0080542c2e46b292a0854a6460d91837859847f60a22949cb3d443d709efb4c4e186838895bf20e1d18
+EBUILD roadie-4.0.0.ebuild 940 BLAKE2B 05635e7f304e7403353fb1712aaf61ae4bd05cb741b335a6c4f1f2a4437ab7b633c05e7c543e4a97f5eddcf3f4efcc66ec292f472de31cc38c6f6d6009fb8fe9 SHA512 0a847f742b417d1b72aef8006e940e9a9c823e4be43d37d388ca457da1f15ba4b601d50c0932aa8001dbbc9ffeff4391ddd9aaf6f1513e35bb28edf943f27ea1
 MISC metadata.xml 328 BLAKE2B 374eb5d062ad86d2f3025d8e2f5945a22a8ef184516b7ec1141b31cc02d13c03c7d59a75364c587e8b8988b0715a14634adef12ca8b4c567e6b60bb1d16b85d3 SHA512 7ca9a77eef77cdb879961d4eb114846d669cf7299ac8ed0649f4c2c357243fdccbe8e1e423b4eb2e880a451a22477768af58cd65c76f143e691e8202eca38031
diff --git a/dev-ruby/roadie/roadie-4.0.0.ebuild b/dev-ruby/roadie/roadie-4.0.0.ebuild
index cd17893e2508..274492987d88 100644
--- a/dev-ruby/roadie/roadie-4.0.0.ebuild
+++ b/dev-ruby/roadie/roadie-4.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/rqrcode/Manifest b/dev-ruby/rqrcode/Manifest
index df3463cb63d3..09fcb3fa2fbf 100644
--- a/dev-ruby/rqrcode/Manifest
+++ b/dev-ruby/rqrcode/Manifest
@@ -1,7 +1,5 @@
-DIST rqrcode-0.10.1.gem 27136 BLAKE2B 7fea719d6e76d340dd6db386994bffc5e7002afbc61e0b476dc639003757f5932598b81274a5ab74bc6dd25d10c61bc023668c8271e9387f7bcc02c6f4dc879b SHA512 5b2d6e63bc069a1cf436d2df159bef673ef621a73d72c52bbdec1c2d820f4553172d5c3499b9347e0939d422bffa8f39ecaae123ce0be360d25ab6c08a6eb583
-DIST rqrcode-1.1.1.tar.gz 101325 BLAKE2B 0ba4a7cf50a45387ebf96e29e1bcc9042ac091582fa0859b95d85a5f112213cdde1f6df8f954219e22501a01729916cc8d4ab7a7ae6562cc770e63515a9a0d75 SHA512 b7d746780bc20c8b3fc59a74f00aab17b5d4a5db458c8f79a8e85146ec2d1b4bd16873792bf7970dede083afd0bc0c54ef4f5d58736b4c9847b644cbe470d0f2
 DIST rqrcode-1.2.0.tar.gz 101432 BLAKE2B 98e7c6d98436d759e5d08575ca98fa292320545e69b63a06422bdeff9a64f5514d0d74c85c7c10941d334ea6168c3b392ac68c8aee19f0c58b6f7d3c125e13b2 SHA512 8a434c72fc43f04dfc92cd7cb6e0423cae94aa24d83a1a6015a170136f1aa3b010b652546b349f15f18e48c85b06a7260ae4babf19907955e0d1b4c2207e6ebc
-EBUILD rqrcode-0.10.1.ebuild 615 BLAKE2B 4e71feca3a6be02c330e61f9672456f2548e88db45a69f0e0b6b2f68eb9e11f9653fa08c8e4e224c28cabda8f84f60a7a2b8ee7f951a0adeba000505551444d9 SHA512 0b7caee127e864598a538289f6494f331a3afb35dac683276b5bef03560dc13727f7d39213aede680630b2825a3e0d9692b8916b228b38528bd150ecdb66e3e9
-EBUILD rqrcode-1.1.1.ebuild 711 BLAKE2B cfb149a9fd78d28a279477a6ffe675299faabef2cea0ad78fc46c02f349f8b8c3f0b45506c7deecd4afad453f546837f3dd1aaec95587a6cfb6297ba3da17bf0 SHA512 9bae589bedec29e97ba05aa3f8ae03c4f3dbe337eab99e4c246366b1b7070ed25779880850ec404c30e73d0480f76d5312634ab3466ea12683542e0751199e5c
-EBUILD rqrcode-1.2.0.ebuild 704 BLAKE2B 3eefaed142a5157534474f6af0f9085fee04a6252fad6c8c9f7258f647043b8838ef9ba36cb8403e5e3d5c69c07ba1a879250b63bf80f4893751804f7eb9a8cb SHA512 e18f38705bbbc0b4d37e2a4d78a96ca1689c6fd613d26af3019c4ac150ed8d4560b0c47d1a0ab4765e54e639126df1a6fe77cc15af1d3b2b77494d322fb6f34a
+DIST rqrcode-2.0.0.tar.gz 107826 BLAKE2B 8b4e8b781fc0427f3bf8e9efa9463cd057019f76a691418aad60e9c5c787566ae44ba0da5d221a38c42809ebe3f78036bd44de87800201d03b394cd0ab3dd625 SHA512 4ef41ecea22187f1316c299ea1fe7ac52dcea0cc549458628247647905778fa1dc4b6301288225e892532976fd3e7a50fde46180f7d91ad146965f5a160ed84b
+EBUILD rqrcode-1.2.0.ebuild 703 BLAKE2B e57b40b3b08218a88a68a476ca7a893e22b02ccd9b258b48b7ba7ebb7ba0ec6575f598846e763c0a51c42d8c0316302ad397e47ad62091a9e9e3b5d88b0ab444 SHA512 1f9c128a67605e31cbb821d0b3ae62d6c23e531c993b68be692d4570d1a0b507922148d238802f3a9ae91e4dca309e2c8c081ba1b5a9563d5f0a8ca51bdd63e3
+EBUILD rqrcode-2.0.0.ebuild 704 BLAKE2B 287ba022b3b46eee656968c0992885fdc28e3d728626be7ef39568ac09330d9237c749f6b6b301181df889c4615a3a1d49639e96ae3a5e2d3c32e07a4c65d7f5 SHA512 4c2afd5f1bb128094738a766aff752b083aa7fb93c53efa8dd7db5a76552630c6bd8494993969181cbd309a7184db896e132813d538a167ead3d982354187989
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rqrcode/rqrcode-0.10.1.ebuild b/dev-ruby/rqrcode/rqrcode-0.10.1.ebuild
deleted file mode 100644
index 88198e0dcffd..000000000000
--- a/dev-ruby/rqrcode/rqrcode-0.10.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://whomwah.github.com/rqrcode/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/chunky_png:0"
-
-all_ruby_prepare() {
-	sed -i -e '1igem "minitest"' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "Dir['test/test_r*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild b/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild
index 291fc43e388a..4068cfdea0f2 100644
--- a/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild
+++ b/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_GEMSPEC="rqrcode.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://whomwah.github.com/rqrcode/"
+HOMEPAGE="https://whomwah.github.io/rqrcode/"
 SRC_URI="https://github.com/whomwah/rqrcode/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-ruby/rqrcode/rqrcode-1.1.1.ebuild b/dev-ruby/rqrcode/rqrcode-2.0.0.ebuild
index 0732f526841c..f89192f2f202 100644
--- a/dev-ruby/rqrcode/rqrcode-1.1.1.ebuild
+++ b/dev-ruby/rqrcode/rqrcode-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -16,7 +16,7 @@ RUBY_FAKEGEM_GEMSPEC="rqrcode.gemspec"
 inherit ruby-fakegem
 
 DESCRIPTION="Library for encoding QR Codes"
-HOMEPAGE="https://whomwah.github.com/rqrcode/"
+HOMEPAGE="https://whomwah.github.io/rqrcode/"
 SRC_URI="https://github.com/whomwah/rqrcode/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -26,9 +26,9 @@ IUSE=""
 
 ruby_add_rdepend "
 	dev-ruby/chunky_png:0
-	>=dev-ruby/rqrcode_core-0.1:0
+	dev-ruby/rqrcode_core:1
 "
 
 all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
diff --git a/dev-ruby/rqrcode_core/Manifest b/dev-ruby/rqrcode_core/Manifest
index 8f8c8c1a12a3..8b51167d0453 100644
--- a/dev-ruby/rqrcode_core/Manifest
+++ b/dev-ruby/rqrcode_core/Manifest
@@ -1,3 +1,5 @@
 DIST rqrcode_core-0.2.0.tar.gz 20167 BLAKE2B 68ddad8e908404a9e156cffd0d1f2704671ffeaca0ce48a2a74b3512076d89812f19b537cbef98f3b0ae046486ab11f7681b187a07fb53539afb188bdcc87c21 SHA512 96a1fc3484aabfc30b9a26da705405e56cb82168d34ce252f35481b03142ddab359dfbfc4601d12f67f5a65d466120fc0a295c66c0a7ae07401b58cbd8d5c47a
+DIST rqrcode_core-1.1.0.tar.gz 20891 BLAKE2B 1900cff03c5533453147c736e254709766e8fd2c8be7ed84695682974611a573d1e4eeb34991707eae5e5b7dad31f4d2e74ac0c412f01dce67e558259608d68b SHA512 c9b571f43eb3bb50843eee480add8b5d6bbec171b7bd4f70e746aca0b0dccc321ea190a234151beb1c6d30bb56c3aa7d8d6522dfc346a46165bd90e9be9c20fd
 EBUILD rqrcode_core-0.2.0.ebuild 661 BLAKE2B d8b90175f8e168e1d6e59d8d4fdae0b7e64e202b6832e13f2de349e49ac4bdd0eb3be170b828112cdc8c4bfb3303063f0d2cb884a21aed722c0b3e242aa2d62e SHA512 b6fecfb477f4cb829e14c3889a16da796ba1e8f2c8832ba030e09dac6884429c64d3d0bef52be9b79b9a066b3affca1dcb760aaad4482b34c1ccda3756774391
+EBUILD rqrcode_core-1.1.0.ebuild 774 BLAKE2B 802678ab261f2f01e6cd60dcc1547d507c63d70cc7272c1be6c2c25a8eba541ceb4a108326ebdd9b5b7f0480e7d75b2ef27e39c2d6d575a5ef71ee83b169555c SHA512 8d0df5867dae3c91f20bb8168e6dac0c07f36662b1b5714ab157d0a4b3f12154f0a7f276852a17320fd9eaca47706d5bf7fdefd60a1e215bf2684e6148816d16
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rqrcode_core/rqrcode_core-1.1.0.ebuild b/dev-ruby/rqrcode_core/rqrcode_core-1.1.0.ebuild
new file mode 100644
index 000000000000..243d00d0334a
--- /dev/null
+++ b/dev-ruby/rqrcode_core/rqrcode_core-1.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="rqrcode_core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for encoding QR Codes"
+HOMEPAGE="https://github.com/whomwah/rqrcode_core/"
+SRC_URI="https://github.com/whomwah/rqrcode_core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 0712c2c06707..a9399b2eab83 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,11 +1,7 @@
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
-DIST rspec-core-3.10.0-git.tgz 396978 BLAKE2B 6fb8947598234351595a8832e47baf941f2ca3e8bd39570fba79b9539a7af51144ef41a257d309eddab895ba1e8ba7fe1efb22c855aaab7f1556998d7024ef4a SHA512 f00531021e20fd389dd7a5129ff3bf338c3fa35dfa5e15b0b73ba16eb081d3d7ed2014b1b2ea4ad2682e06f2822c2b895736ac9e80d6af3fba1aecb5cfcea8a3
 DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f71de3b04376dfbfc9c831ce075b4105f6a23a210f8508784b66c46f1126c188a3bd0548cc4f24060373b9c7e0b79101 SHA512 2d134e742e36cfaac0a52fa7ebd949391cfe58419956536a65fa3aefa2c7f3638fe19f7324ca3e0d2642cc5a9d33de11b09bd571844f1cfae9c077e5f27563d5
-DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8
 DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
 EBUILD rspec-core-2.99.2-r2.ebuild 5100 BLAKE2B 44d2904b5aa3f222fad677c0ac53a5f46602e2fc5505b57f1e4b0d8c68bf8222b506d9cf0c1403a4e05292fbbba6eb658cec5727e48e4c79b6bb4af338d8d370 SHA512 6feaa484ecc73472c5f5909b82d9570fcd617c5eecd08e70037fc96f1695fb801f21baa12dc4224c79f54f615a0afb0b53c06d7758e215e08c2c34f034a7367b
-EBUILD rspec-core-3.10.0.ebuild 3122 BLAKE2B 58bd8badcbb0964abb5423e670851cc5ef92a3a5fa9d6447d3e3aa956ed68663ceedad163cdee1b444d38c430951e13e3e1d8c36e602997b0f6b5390c6d9ddcd SHA512 6f3733d2bb0d380179660affa708431db24eee41d1893efcfde3e05ba7ebcda304aa1ddd96f34b4ce979e167e4dafc91e8545b01180f55718ba022f3c2b0a8b8
-EBUILD rspec-core-3.10.1.ebuild 3129 BLAKE2B 2ec064d95a419e5b85ef02891a610a3866c3f6f63aa5b3088c933eccd05fee80b2eab641eb62dea411649e361fc5acfbacb35297bdda4a6cda025055c3ce61fb SHA512 56b35b1a76c2857ea957e354d742d1b8368244c4cd4cb509c8f50b77b4849755f0e9fd3837172b5b6a59838fe86fdc9c9586aece51065f53feb7df85c5919c2e
-EBUILD rspec-core-3.8.2.ebuild 3155 BLAKE2B 501c18233366fbe9e5f45f9ab3bef568f23c546255b2d206a24384ae9caaab50bf5fc354119452eaafa09edc0f959562418f9bc7a9b8465b72d6e8a762557c89 SHA512 c9c05b12b6f55337e9faa271fed134fccd8e8b1b851c8192bed1a582c7b344f91bd30d0e41bedd5a705d6f76d426b770c890def4a6cd72a40895d7ed8433c253
+EBUILD rspec-core-3.10.1.ebuild 3128 BLAKE2B 9b96bc3dafe2a87b1c04cc54d76f46b9d54bfd3ede372576474a242bdc61df3403492e1a34b874ba8c25395b8605c87cdb76542a6c04c783c764c5cc9024126c SHA512 e0c0507300c4b79cc089b27ddc25964017cd487b533b83178b5e5989e2f258005e762c2a89c49d1222d3133c6a9deec27dd6ddb322435523389d1c026f7fb882
 EBUILD rspec-core-3.9.3.ebuild 3122 BLAKE2B c8dcd45114eeb2f4acf1aea3934f9daa173ff57899cb234586f7e720508953d960bbc5d8bee29695140f4177660f0ab4081639a5b274d747b7b0f6b4a7530053 SHA512 6050a529b3c922a832403288731ac2b4ded5719693d735e5e6650c62b3a7a8a22a3091d2f66376b23a51538c2c36a61f7b638a0f5f6c701a58e4ac071a8eb076
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild
deleted file mode 100644
index 540f58d9c7a9..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.10.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-		>=dev-ruby/rspec-support-3.9.1:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-
-	# Avoid a spec depending on specifics on local networks
-	# This fails when localhost resolves to ::1 which may be a
-	# ruby regression in the drb/acl code.
-	rm -f spec/rspec/core/bisect/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
index deb0b8bb5638..e6273670e72b 100644
--- a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
deleted file mode 100644
index 4e6ee66dbb71..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.8.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-support-${SUBVERSION}*
-	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.1.1 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.1.1
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.8.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# Avoid aruba dependency so that we don't end up in dependency hell.
-	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
-	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
-
-	# Avoid a spec failing due to path issues
-	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
-		spec/rspec/core/configuration_spec.rb || die
-
-	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
-	# dependencies, bug 662328
-	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
-
-	# Avoid a spec depending on specifics on local networks
-	# This fails when localhost resolves to ::1 which may be a
-	# ruby regression in the drb/acl code.
-	rm -f spec/rspec/core/bisect/server_spec.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index f9cb568c3382..1218705dd33c 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,13 +1,7 @@
 DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
-DIST rspec-expectations-3.10.0-git.tgz 211125 BLAKE2B 50fc17eadc94b94a28bf56b1ba6af1d45afe3f62548533515c49eb434becc11ce12f6b6fbd92e98483a1e7c97beec4f0dbb87bc00f3dc9fa1f6877480dab331e SHA512 edb0be319ca2459425498ebe84db0f712dd9d97b36c8a1d99a810ad16f877226bdf9b88c8e84a8379659179868a173745501ce933519727eae20619cb15c4b2d
 DIST rspec-expectations-3.10.1-git.tgz 212281 BLAKE2B a1872a7f71c198db1662eca48bcb34c054f05c16193395962cb47a7fa230c2f0f83bedee302a0ab6a81380a361640177ac3370d8829faa6bd362c07e3a551e5e SHA512 35999542bf70ff04a472e50434abb8815cac8bf10b680da458f5e0e6ee290a1a6356a22cc12f0a8a6310cf282bb6cd99f922fcc63a0cf1e252b167e451bcf7d4
-DIST rspec-expectations-3.8.4-git.tgz 200149 BLAKE2B 45fe4cdc4b032bb773ef0e7d3e9b75e6d14a6e8c1850ad6fd84991d85a61860730caa9f191aa9d1ce4e21c85dadd2c52bb69bd0a1454f5ab918dc1e563fc54f1 SHA512 0ecb16f11ccf19c02c40ce587f33846fb2241f1663dd87f012b9b782338c213362dac624c434dee6e00ad2cc7ec4a1cd0af7f2edf1a8e9ebb0a0dfb31cd244d8
-DIST rspec-expectations-3.8.6-git.tgz 200343 BLAKE2B 9d668216c18716344e8c249086bcbf2b70e7c1a5a0d1f3a5328fe03752ef4ace6f5029219314016a4bb00ef482f440702a2adb7d9fe49392b5b1c6ec15f6a2e5 SHA512 9ded8de53127f63f2117f5ef64b6608b643586be498d8df24909366ce159a8bb95c9d8771633b777897f3e4ad3c9a12e3dfe62b2310513320b3d9656d24a120a
 DIST rspec-expectations-3.9.4-git.tgz 206297 BLAKE2B c5dbebcf7b411c9cb5cd815dc06fb6f455e82181856661110f803b25f3910975f0676f3cf154e93fe771849363593e104e0f2dd298dfd3d8b1dd96a6ff991547 SHA512 bd025b89751b5b8d3c6bd61a90386fc05ca371e04247d93b29334bbb3eceb84bacea3f3846c20f08dbf53f174992b2dc0fe9f2bc449c4591188b5e428b1d8003
 EBUILD rspec-expectations-2.99.2.ebuild 1624 BLAKE2B 4cbf18eee1c7b553b3fa9fb96e7c08f9f46bdb681dae046f8305e1af545746bbf77331412b0b4acffd522425c43c2d773524e4e29a8d8f68364f95f9e52c3166 SHA512 3f7a1635a4f8bae6a87f9523b42a1cd55c8e48ae2e580d7cd7066da60d6fe98c1a449263cc8e593e451bd5f2eb245065548faf1d540021ebc83ff90eba614b8b
-EBUILD rspec-expectations-3.10.0.ebuild 1304 BLAKE2B ad2aabe0ea5dc817aa69e8de604a4cc3ec8d0f796d44769ee652bf468f9dad38902a2da949f09970e8c393e211c247c1a6a8132ab4e5ec318af2fb572cd8eff7 SHA512 ca0c3b67e5418123b152a46e33cafdb6e79ff76c14c4f7bf802fd172e3468c5b1cf8c291effdec7d11e324897016fa8a09008da135bc67f5acae85946b5f146e
-EBUILD rspec-expectations-3.10.1.ebuild 1311 BLAKE2B 48188a1f2266e9f4e438eb24d3e3440fb8a4ddd355cd4d89c80c6b5556ef099534efaf2f1b29180abfa79fba41a075d2055ecdaf1ff1fa9ef504a91a84cc1828 SHA512 68e428d1980b7527d0cb9009ea56d224c0b2d81e76df9404a538a9e5a3df6a698e72b1d30731c895495532e481f406d70cb45515c954d8c5ff2b19b05b20d4e2
-EBUILD rspec-expectations-3.8.4.ebuild 1300 BLAKE2B 05a36d67c616f520bd08f0ed9083de0ae39398b9dbe3838273b9985e016742fbafbd52949c983d39247c6df113e74ebc3ca159e668139663dc8d995029473061 SHA512 274a5b9656a7b4abfd98f39aca21b4b082585b430e8b24d8596807381cee0a07e7a857d38b49e0ffa9810322e1d70c6cd70310aa67e6a8f93ee47759802a23f2
-EBUILD rspec-expectations-3.8.6.ebuild 1303 BLAKE2B 2c40484e29ab7a72beff3861fa6ab65716d4699de5dad11d3502ab85a1aec89161804baf427a711a1a650c4e789236811cc032d253b6478d304b7b331c2a82f1 SHA512 921ec7cb34858a17d79d8bf5ff9dc34c5fea372e9f8dd3d2ef4be6136c57d9a26f2b36ad8c338bb640ad82ba8f06553715499c4bbd8fd9d1c61fa083ab8de66b
+EBUILD rspec-expectations-3.10.1.ebuild 1309 BLAKE2B a101ab35dbe7e8920253f14d6b9dcb01befe0fdf1206fb2e77a4cccd48fc5667d670ca88017d9e8d0caec0ee8fbcc5cfcbb2b1da843cd0bb4c5925296f8bfdc3 SHA512 4b9cba5c1cc99fe4a25ed0dcfa4596814bbd6763948d6231705484f60e26a2dc9e8e2ec036d978f55e04219448156b03e0c25f95295c36ec654d57503a68d996
 EBUILD rspec-expectations-3.9.4.ebuild 1296 BLAKE2B 17662e721fd6dedf56a32fe1d93828a0585dea6e8e43a546f552ef8dc173f3db2bc42492c82d25c263dae964f1af6436147f53cf0a9b1518ecb82ed41edaf9f2 SHA512 847676fecf6abcaee6801ecd477cc86fac1de5c5bf98c2af411200ae5005dc5598a2ee2e1de8679f0e7a9d420be97360421557cc40afa9f1734d0ce69cfd5dcc
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild
deleted file mode 100644
index 84439fd818ed..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
index e005f9f4340b..537e21832e7e 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
deleted file mode 100644
index 1177b5849e92..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.6.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.6.ebuild
deleted file mode 100644
index 37d5b78b6648..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 466ad141502d..bd8a649f09fc 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,15 +1,7 @@
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
-DIST rspec-mocks-3.10.0-git.tgz 193499 BLAKE2B 9bddac80a299e2fc8f549bf4beb2bd3fa5dea21486df7dda9112b008334014284330965881207fedf4b6bea09c25f36b8b2e15ac7bbc6cb244f3504942673d0c SHA512 a2bf76a59b74b89891e4032519fe83ae49a662d3508ecbd9919e6a76d13f0a736063e7215bfda21a3aa58cd88e69fd5eea2a4cbf998a06ee0c192c3d5650995a
-DIST rspec-mocks-3.10.1-git.tgz 194945 BLAKE2B 7e61c88bde222d7bbe7e4d10b42ad9505469184bb16bb6c693ac2f5fd153ab8293046ca60813e5b604f011e1acc140b3883afce631ea442f90579fd8652fa79f SHA512 48eeb2f3a2dac666683016b2e3698a4c793a485b8f264ed2ffbb6f948d6f804ab1cebc66cec1e76c5b538517be50b6f424d92e53c1a0c86905307f1cdf114abf
 DIST rspec-mocks-3.10.2-git.tgz 196040 BLAKE2B 8e975dc8480d4709f650ff27c517104714156c551b8b9ec04681132bd92be80bdb11867730f462e7fb6b672430246a0a11404dec5638b5350b57d81a8eac2e57 SHA512 ab11fa77c5f9e3bec2003dc8825d9582dcbffa08a36818bd9cdbe2dfd357113de3712c818deafc165530f9e4d2683ec06e54d37c37aeb820ae3cd592f76cf2cb
-DIST rspec-mocks-3.8.1-git.tgz 191543 BLAKE2B dae8b22a011a3563eb65d1709006169bf5dcf310749cb858f4ff20c7b82e7675a616fc427136fe5e0edeef1db0b42a1d0af1c5623eed35807e84dc355131c8cc SHA512 ec71c4b815beef315f8db329bd2b0e60cdbb1fa37939c624799c1589d94dd28f74b3d1a4c0b9025bc98a809f80d625315458351fe7dec8291bad20e79beecca8
-DIST rspec-mocks-3.8.2-git.tgz 191807 BLAKE2B 9ec44fcaad9fe1e9d75cfb84253e52411b7083070de5dbb19bcdf7c518eb2439e6493e979daf814df7b31bab8bbe72821d42eb797ab88d95e051a700b63d93b5 SHA512 42b9b952386ce862a1cc19116991ae6b4633d551db057babe2e4aa6553acb6eafbb05b98df8a5c6cb362a00025ac3ce0f43f3c4e4ea63343c8bf0dad769a3aed
 DIST rspec-mocks-3.9.1-git.tgz 192772 BLAKE2B abcc8fc82648993e6a407a8c4ac4f5b146b821e1e842c1dd2b95824d8468aac0ea796438d77e376c897675f66bd2bc9024da8fa5ccaf60139ea296b388d542cd SHA512 f804783fca4cf2258e83f82515cd5881ceae0bdd3aedb452a1db901e01de5dbca1d2bdef0ac0828a4bd23a1de58d127a42150c8c204219bca39ea7072619098f
 EBUILD rspec-mocks-2.99.2.ebuild 1510 BLAKE2B 73e9ab4e1931b72fc900af16ca022a6ce1b2c053e32904b5b07f4023e3347c3e9974e6e834c0688b3feefae0720bad1000526b2702779ab19f4aeaae468b9052 SHA512 057e150cdbe87559c945285ba98ab615fbd900e538b48aeeb73847563cdf9e0b05fe287cbcbb0ed687c644df5cd085c68d078ac02b2182f998392fef04ccd56b
-EBUILD rspec-mocks-3.10.0.ebuild 1435 BLAKE2B 6cff4a15f91e0f6b0e52f15a2b55afba66a4b85672e517bb3fa30ff4c282c7204be194b8bb73a879b0fb70088c11659ac60344d3826fcfd54b94bc20ac302595 SHA512 09b34aed37d5bbd8080a51d69e6f6101e529d28cf1ee4079e768779ff31a25bdaf102f6c5db0bba65f6484eb8d4a04f6a4082d791cd8c509f7f557183cc865d2
-EBUILD rspec-mocks-3.10.1.ebuild 1435 BLAKE2B 6cff4a15f91e0f6b0e52f15a2b55afba66a4b85672e517bb3fa30ff4c282c7204be194b8bb73a879b0fb70088c11659ac60344d3826fcfd54b94bc20ac302595 SHA512 09b34aed37d5bbd8080a51d69e6f6101e529d28cf1ee4079e768779ff31a25bdaf102f6c5db0bba65f6484eb8d4a04f6a4082d791cd8c509f7f557183cc865d2
-EBUILD rspec-mocks-3.10.2.ebuild 1442 BLAKE2B 8f4293beb74f1833b97708277f276cffc18b8e465837a7140dc52647ead51dba228a95bb31130e09aae59e0d8efd779f702121456c8ee0c4575fd9c7d1c65e79 SHA512 69b9eb07f49f2ccc576447d3dc608d11bf3d679aaaf2a94ac16bf4857a63214b03105d64ca2f9ddbd7ef78af50b6171a43ec4d457b1c6715abb3a88241e96f9d
-EBUILD rspec-mocks-3.8.1.ebuild 1324 BLAKE2B 782f86b9db23490be405e24bc559a23955b21d90d19c19991fe69e94f9912cc435604c3ee23ab39f3ce4aec7429b43c5360edc0b3c36d76c9bae3d8faa728a38 SHA512 5580f5837b0341cc07087cb6e693e5a97b1c9bce0f4d478c4c17c934c77826ed203f904d6b594bd3092defd67dd159cddbdd24fef6edaca78ce2a054a00b43f4
-EBUILD rspec-mocks-3.8.2.ebuild 1366 BLAKE2B 0cdc605e786cb06766d8669b464c426b216aeda9b68bbc5a7c998c6169206ba0a07bffba618f690e251e54ea0bf2f5cf844d321f21b7f7f598143a22c5bcf733 SHA512 21422cb8a959b03728f4d609e8c82324806a530f1d53baaea9f0bd23936142930e92535c2e30714e43201f9efb286a87a17a2570f8996352808ba12aa9dad5b1
+EBUILD rspec-mocks-3.10.2.ebuild 1440 BLAKE2B 44f047bb22bdb66050a648899a26731b2b8c20bee0471dabdbaccbdc7e6ab2a5e2ff836a2afe0bf920d827a703fd4644cb39e0006859aae0975b109aae32f147 SHA512 09c91c2f981db4d0d2c37c856a8c1571fc59c70d608b8a5275c9c35dead957c493b4dd06e492e78cb0a25c4446c0420324cb1d050e01dc917aeed0e46810e924
 EBUILD rspec-mocks-3.9.1.ebuild 1435 BLAKE2B 82814e4352a4fad72c57ff163fcfc10ef08ac94b3048b3b96fa5c5a42e0d2612a8328365b5aa8002e8ef97c3fdc85d592eb9faf6c2d90a3b0a4b0c7c2f11479c SHA512 a5b411e0173fa229e6e754335911807c10768311508d8a2f8c0decff12c422cc6185290c9d2a5b9e94c9b510c8e739ae7a6e6c5957bcf9d1becbf0c56beaa90c
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild
deleted file mode 100644
index adff253329a5..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.10.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.1.ebuild
deleted file mode 100644
index adff253329a5..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.10.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
-	sed -i -e 's/git ls-files --/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
index 0aa9141a0fe9..9d832837db1d 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
deleted file mode 100644
index 1348e1d322c7..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.8.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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 eapi7-ver
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.8.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.2.ebuild
deleted file mode 100644
index fe35820547d5..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.8.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index d7e9b2495761..e2c6e2c97dc6 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,11 +1,11 @@
-DIST rspec-rails-3.8.3.tar.gz 138053 BLAKE2B dab5764d65d484a8a808a2104a3ab093c2ef2e822cacd136996eddb767a972f89df9a459509e701e5541f6b9c42a3b700a4daa816c0391474e004b4558feb2a7 SHA512 210a278cf82c20c4f5ef7faa5e253b9e18609d34467e91cb8728e6116c7cfb15d17fe8941fc15b776bb169e0275df623535b86fc160afe3e49432948f246a165
 DIST rspec-rails-3.9.1.tar.gz 143459 BLAKE2B 87a691df63a438b15b5726a802632c16373c784cc66216c1b099ed7e36e0916fdfe7ca1fb964904678b779b8fa90f0659971c4af00f9ca3a1071adf2216466bd SHA512 247acda67672ea3fa0641ea36d6209c8876597c63180979713db257e02cb4282b122af4cc0aa540dae984acdb16afdc4359012360b951f0599710fe422cdccac
 DIST rspec-rails-4.0.1.tar.gz 153383 BLAKE2B b2591fe27e992df11404f792e7efe1e18fa023e0b4b7c076f7ffc86e83228a013f06206c687167966413641aea654f57f0d1c0a057ecdfd9c1579fd38d08fcfd SHA512 97b06a8696181fb0209e376780860935f1c22cd9a2ae5977efd45217ab74e6cc0260687bb2ccd22f28cf69f2a73ded43c51ac8d43d0d0b6b0bd0fb3e547d920b
 DIST rspec-rails-4.0.2.tar.gz 153760 BLAKE2B ba609fe316a27c21f140df41b63916cb9a70e77302e3dbe1fa565024e85504e63d4f7bd575117f91f9762bdadf5b462acadefdde1d36a6a731227fa2e2cd5ed7 SHA512 4b4567ba896a80fd487ddcca466d23d6b9e634354f8b70d0146ddbf0c119628406ba8aad4e16bce577e63cc4d3d476c270c4c2f1ad1956bde7529f318b717cf9
 DIST rspec-rails-4.1.2.tar.gz 156296 BLAKE2B ca454065c8fb318148e745162514b9f21aaf6050ae72981d12a23b838bc7d985350c8abd60a36c07cb5c8c8bd80dd7b97b0dcb9ab6f5fb30ec4a6d99aaf189d4 SHA512 c0555d3b0d1ea91c9460981216cb0e4d1999e712daf18e5270aa20daee9667e3e669c918204e863bea0b6a97a63a79cdb1cd261d396743fdfbcc41109211ce89
-EBUILD rspec-rails-3.8.3.ebuild 1459 BLAKE2B c31f9b9bba3e58b1a3e5cda4a7ca79ef70e4f3e22ae2b4058e1472cab069ab8f82c106959182e9d54dd1ad31b225ca3123fae7df87e0a7469dbcf995ddc2a068 SHA512 52ead09f8510a2cd7295df49c378d91d7171dfaec0a1f7335b1255128c8437c21e4815367f57dcebe0d47c43aa4bb88a6c0d37f1a7242c03472c6fabccf32a82
+DIST rspec-rails-5.0.1.tar.gz 156435 BLAKE2B e32016bdaf50fc4dccb0700320738aa0ef59e5fb7a3e351f68a1b9ad6d86be07850aa473166b0aee037f9dd2f21935c41c4ec502849ac5eeaf08ec602093d81a SHA512 65b212870524397a922dd7fc6a796c50b56d454378785b1ff36eb9e0fa9e08291bff0360a7e56710322a7edb33b800e55b9f46bacb92b3a65f53489307c57149
 EBUILD rspec-rails-3.9.1.ebuild 1511 BLAKE2B c7b77b6d1e9ec550b58e829db92d7746a45709c07a39c5af021188f0ac39ecfdcdd4425125f4f41b2da4d93622beaaaad2133e49a5457a4b46f9d287e4de4d97 SHA512 1a8f965898cf9a073b18d456834dd4c02bb25f68b53f7d818a354be2ae531b1b5d1f3c5cff1a044fa9b6953648d6907014f0ba5b2fcd81082c36a4dbe78d8421
 EBUILD rspec-rails-4.0.1.ebuild 1367 BLAKE2B dd40fa8fe0db77774cbed7425290f70ec91834b72651d1ed6bef4917aa82872b16466be9093afa97d153249238babce110fbd3ab9ec5379a450a0a151ff5d556 SHA512 ee6d372407018a1b9688d5e14277adcec37e0d70e2a76f035d80b7a8df3d513c2214915d5e7361fcddc75d22b73e5d02751fed1eb108e58b15dcac7d4e7da2be
 EBUILD rspec-rails-4.0.2.ebuild 1368 BLAKE2B dc977da2d3b56afa37dd6f4d1385e1ccccb0612eab23376fcc87274601787d789cdef33fe5c10db6cc3a739a2784b093e219118b4228e9ab5b5f23ddb4c2b148 SHA512 6136754bd318992589ec3c988bddbaa767b9c0ea55df2ab133806d51091fbcae8530d00ba2ccb2cd6dc42ada46b0a8c8c1c4a05c99e3b5eb8a4e86295c6e3aef
-EBUILD rspec-rails-4.1.2.ebuild 1548 BLAKE2B f7d0e6151431a0305fc488e39a8ff5ffb09f1521eddc1ccb89fca49e3a701172facca638e36d961e97e0240fb7e00b599f1859b44288509f50f87f54091032c3 SHA512 ae240306e696068709cc13b21b0ffb83578f93bbaa072c996669f2f7e3a78a7bc81346780a6bcabe4d413de4ef95f591d984eb34b4f96840169d4d00b2fd20c9
+EBUILD rspec-rails-4.1.2.ebuild 1555 BLAKE2B d97b1683244bf2bf54c19148dd5aae18eb673a79f5b3e95d33adf0636758c92200a2034b6ff070785d129ff7b5537d190321308577713c0521d4475bbd95ba01 SHA512 d7e405df0f5949eecfbd5f3c67bc440b7cbe446c11ddc2db0b93d7c7c29d0e8baf49de69052c134e47bebc2b4affaf6a9c6a6c4668491397f9f1b4177810cd5d
+EBUILD rspec-rails-5.0.1.ebuild 1628 BLAKE2B 19a274bb361718dc4ae3bcb900a32ad9ff43bdac8756e2a9daacccd102e2d96ecbd0bb9550c561dd4255bc3027c23b04ac2f62d76cf52cfb2307ca80e1cf5d28 SHA512 dab4ea66388a1f7ff63f32f454c09a07191e5da24f73c43aebdfe4fd155ed85cc29d3689985013fb61fb6c6e776f36c494afdb44e4d93e7b9fa512ea0ec96af1
 MISC metadata.xml 343 BLAKE2B 3c1684a27906b05d1f72b32ec225db0fcd6e051bf9d6a3b4f83e3cc1ff63201410594a6b2a2664ca008b7756b6e98cbbcc3981136075dcc41a622f3ad3566b36 SHA512 bc9d8d9978e4bd845b10fabf5256e53a1a0c3835305f7e72502d1074e2692fdeaca15b2ecade251be8dbbae544167072a920db14a964644b70782f37b9d91369
diff --git a/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild
index 480dc9c27b92..4414e29a7f7c 100644
--- a/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-4.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.8.3.ebuild b/dev-ruby/rspec-rails/rspec-rails-5.0.1.ebuild
index bc90364ea0a4..d2466b6e3dd6 100644
--- a/dev-ruby/rspec-rails/rspec-rails-3.8.3.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-5.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -19,30 +19,29 @@ HOMEPAGE="https://rspec.info/"
 SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="3"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64"
 IUSE=""
 
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/actionpack-3.0:*
-	>=dev-ruby/railties-3.0:*
-	=dev-ruby/rspec-${SUBVERSION}*"
+ruby_add_rdepend "
+	|| ( dev-ruby/activesupport:6.1 dev-ruby/activesupport:6.0 dev-ruby/activesupport:5.2 )
+	|| ( dev-ruby/actionpack:6.1 dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
+	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
+	>=dev-ruby/rspec-3.10:3"
 
 # Depend on the package being already installed for tests, because
 # requiring ammeter will load it, and we need a consistent set of rspec
 # and rspec-rails for that to work.
 ruby_add_bdepend "test? (
 	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.2
+	>=dev-ruby/ammeter-1.1.5
 	~dev-ruby/rspec-rails-${PV}
 )"
 
 all_ruby_prepare() {
 	# Remove .rspec options to avoid dependency on newer rspec when
 	# bootstrapping.
-	rm -f .rspec || die
+	echo "--require spec_helper" > .rspec || die
 
 	# Avoid bundler-specific specs.
 	rm -f spec/sanity_check_spec.rb || die
@@ -50,7 +49,10 @@ all_ruby_prepare() {
 	# Avoid broken controller generator specs for now.
 	rm -fr spec/generators/rspec || die
 
-	# Avoid loading rspec/rails explicitly since ammeter/init will also
-	# do this and loading it twice causes an error
-	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
+	# Test with a compatible rails version
+	sed -i -e '1igem "rails", "<6.1"' spec/spec_helper.rb || die
+
+	# Fix gemspec.
+	sed -e 's/git ls-files --/find/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 }
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 9ae6a6db5fc7..0a9fdb36a50f 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,13 +1,5 @@
-DIST rspec-support-3.10.0-git.tgz 72853 BLAKE2B 59c585800013fff2dea15ad33dfeed430c9a932206623bb368f4f4660682f537391090cc8538f9052ebafcab336ebd2fdc79003844330adc447be6d977e5648b SHA512 f7183f01b7a7ad55360823617a88a46b2351063d85d81bbd722ecf8b4bb41d014c9ae0af6123caa9405374d484aa61971153f4c59d009986aa20e93afd4a177d
-DIST rspec-support-3.10.1-git.tgz 74378 BLAKE2B b0b077c50572b654a8aec6dbbacb77a5ccbb68772a1a33c59ce1b424f0bfb6b72d1d4770234a8dec23a4126dc825189f67811913580f94570af7b8c33e217ab3 SHA512 e7240e591b76dc714880dc91da1e755a0d44d81f0de6861858293f4132a353b3b41a96175a58d81813222f254e6dfaac92170ab2fd3a8bd8e73ce7ba924e614f
 DIST rspec-support-3.10.2-git.tgz 74812 BLAKE2B e6c7e768d0df05fa5e77055efcc69699192928a35029264300faccf500b1ce7367e74e9c2ae0f7f8f0a5e755692ac83b982d0a3dab3da3ab697ad2c5766aa30d SHA512 bd1fb5d737dfdbb7399d766854f0b173dad89675bac580cf65c5d42ab6cd04ad1773e7cfa875dfa4c6fac14f4ccbd6b48813bae5de26c931c804962d29b014be
-DIST rspec-support-3.8.2-git.tgz 69112 BLAKE2B 84600d3e2b4d847618f7f53efdf60be3836c7ba6c586de88cdf085e84749e616ad556683b1e7b588b9aec08adee10054e64ae1daf69c6ad58a00d1c2447171f7 SHA512 9fb9f8f2507edee5e7c414d32c1641803eed7a5e17fd300308449277ec6efb786f07207d8f28bcea0a669b8d76a2da53057488d149990ae973c0f7a0343180dc
-DIST rspec-support-3.8.3-git.tgz 69654 BLAKE2B 1ea3eed0602655fbf5f92cdc14217eb8377d980378c9835a342840bb7a00bb1cf095b6fe57a24f80c01ce1835b398ac3c1bd11ac1f95a90b501be6a000e8f6d2 SHA512 90d678e08ca93be30ace986a60aba4c4a81a58d7c56d34863aca70f91efe92480299970aa7eb158e3f8c4878b1ea3303aa0afabfc8c7782bc78f7f63b90b4f9a
 DIST rspec-support-3.9.4-git.tgz 72490 BLAKE2B 03c3ba8316a2c6a79faf68db87adf193b684b82119dd9c5b67f2954f3ce72cf03e3e16898e2f5d57d76aef37bb8fb08ab8dacf8aaef6d1445a8257e2be14afe5 SHA512 95be2e03c37117d6bc132ce466779a8ac3c4fedadfb2a6dabb1fa11601aae908e341c87436dd526bbc8b02040b23200c95bd113d0475405afdb4acd099c67403
-EBUILD rspec-support-3.10.0.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
-EBUILD rspec-support-3.10.1.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
-EBUILD rspec-support-3.10.2.ebuild 1765 BLAKE2B d1c34dba172b33add7e0ca49281935f11799c3ca934cb3779254fb5e046949636ca749183fe3fb40b1a5722f05ccd97175d60a489dbed5aac56c5521ebca5fad SHA512 840ae6fa8efbbb568f20b067b6dedfa3475a6c0e30f551d6a633cde08bbfe8b3a49eda356511e387ad2c95a3123e822092addd457894c30e9c977d24fb60453f
-EBUILD rspec-support-3.8.2.ebuild 1563 BLAKE2B d388a0d0d0cd4fe9f6b0e1091fa8ad236ba4d23db94b803a70f0f6975c81526471a5a9bbbaff630cfa74e8e95aa288fdacd9d394b582120ada677dd3a5d54bd5 SHA512 34fba145dbc3e3087edf5cee218846718495b466e4eae087c471606055d7838fb0da7e2188f7b4012fa2cac6df340a606ebcb58b4131f2c62054adae4fd41b21
-EBUILD rspec-support-3.8.3.ebuild 1540 BLAKE2B ee0b161150293923d5c1b068cfc6a27d46e99544902b2c8e582f4a7a63b85a94ec146e821a2706ec857e1b853f847ca2abf2e48a7f9b882ad5d428dc2cf97bc2 SHA512 cc2e2141826574d15a10b30604432d99de74ab5f639bf126b7690c35f14e378c1db7297bb055842f970b363980f7a111436dd65db2ece4845ce18f739614bcce
+EBUILD rspec-support-3.10.2.ebuild 1763 BLAKE2B 88f33e6b7e92f6990167ad2895e61609a74e07e94aca63ac94e1994e08e2d5ad3db6ee8b921356b859b35b6536be6a4924e9678b97ae2d8d89e719582f66802d SHA512 3df03fa1c6e41919912ea34d4c71295e7686a2931c1d64c095a7b36f4801c3a20bfa2268100ad33e2f670cb3491526e1d8fb52e035a554b8a244a8ad42150781
 EBUILD rspec-support-3.9.4.ebuild 1751 BLAKE2B a68477e2a7e7deb6af3b4d4ff1a31cb3810b1e545ccdb309f73b9665527f14952caf2471b4f04da4174da930c25da66a348c804c80b214ce0a889f93d87fdc54 SHA512 ef906eb462681dfc4d95458228a9f796af4ccf59cba157392492601382a4eefe629bccee1f7d6359c877c159de40e31ca604395973f08cf700843b7604ae15b2
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild
deleted file mode 100644
index 6b2a13cb99da..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the ruby version being tested
-	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rspec spec || die
-}
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.1.ebuild
deleted file mode 100644
index 6b2a13cb99da..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.10.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the ruby version being tested
-	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rspec spec || die
-}
diff --git a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
index 58f8a11b6a51..c41890895656 100644
--- a/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
diff --git a/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
deleted file mode 100644
index 65f0b8ad83e6..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
diff --git a/dev-ruby/rspec-support/rspec-support-3.8.3.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.3.ebuild
deleted file mode 100644
index e941c51e7378..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.8.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Remove spec that, by following symlinks, tries to scan pretty much
-	# the whole filesystem.
-	rm spec/rspec/support/caller_filter_spec.rb || die
-
-	# Avoid spec that requires a dependency on git
-	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
-
-	# Avoid a spec requiring a specific locale
-	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
-
-	# Avoid a brittle spec depending on ruby implementation details
-	# should be fixed upstream in next version
-	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
-}
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 7cd54d8a195a..309347a7d483 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,9 +1,7 @@
 DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a6703998885418460b2c0bb59574ef144c416518099a77905ca7676852903804169d1bafc2cf8b3f79654b669c43762 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8
 DIST rspec-3.10.0.gem 10752 BLAKE2B e0af9c31a5263b0656341be7432e1597afa56af9bfc5e6d21f1daa7553e5bd3daf2b383a7e1a5b6f761a5880540020e7accd8d4eb6cca6e57d616dcc41690970 SHA512 dd1a3a1c7c73ae9c053e071d7851780d8cf61e92ddba24072b9f2c00a342ed08c81090332ba2eaf7ab96adac3fc723685996195e5cc584e15de57ff02a4455ec
-DIST rspec-3.8.0.gem 10752 BLAKE2B 14b1710fb64fb2ab46d59ac692ceb95dbe7f5e2f5c54e4f97170bd99c2b0d32e1977250f69160ab191367c8016663ecf5cd4e0c89941ff12c727ed52e6118551 SHA512 aa3ecee499240a26866797c00461c7e63915bb84a9a29afce75bd4e7864027588bafde05b108aa7b6d988c1a123265587db807567a8e0f3d03527b0f2d8329ba
 DIST rspec-3.9.0.gem 10752 BLAKE2B 212cebbae9e71b8a090757ec4b9902f20043eaf95b079a409247990e1fca4236e13d0e9a3bd9b9eacfbc2d2aaab19583452dbe08b298ca69a85e20f0163741c2 SHA512 a7dbb22f01d842a41b54c375d32d94c77a7b964d1ea5b1971e7c228dfd5dbfcfe03c007d687781addb93f819dde8de664dda307c266137fdd0a07dab96f96fad
 EBUILD rspec-2.99.0.ebuild 774 BLAKE2B 7063d9c2312d4609dee333c73b6c4f60f7762d27efc93cfc18f305aae582e55144635a6c7bd0178a4a86d02010cd932552c3fb801df1c31af46ea542c5d5de98 SHA512 481067515fd46d721fb2de15150e34b5d1652fd725e9af505a1ec3b074c100cdb5bc0996d305c9fa010dabbac2545c2980ad748cce101bd92aa56bf561fce104
-EBUILD rspec-3.10.0.ebuild 623 BLAKE2B 0bf5bc7f10109a4a7064b19c9869cf77624718589f3bccd7cdbd044a2ad53fd38f47e1a03931693d8fed36a7d6b4025e9dffd74aae08115aacfd4cb527080e5a SHA512 3bc176a32152dfe7da29d4c061f25eb7b9d6e67566b8c24b922625d27075ea5910d1c978bfdcfda6b4c5c974877dbd4617a0aeb9611c771b43f627e6d121fbb3
-EBUILD rspec-3.8.0.ebuild 651 BLAKE2B 56a500ff238798ffee835648b4406712e3a750565e6dbd483aea8d35ae943995804027fbe54f15fe63c2b6ca2ca787a40000ff84de1e4373498d72aa801ca0e0 SHA512 f19426693fb2caf540c55c11e6f27f9dd4924291fa735192f526a5e5e82a38a1e29222086284edefb6e510bf075a7729dd853e8d197599a1d03b243a0913be15
+EBUILD rspec-3.10.0.ebuild 622 BLAKE2B b419700650bb77b58b3816513595a1eea6421cf6ef7da5bbd1151d4551d33e444d32a3b85fb31e3eb98c4b2300d34b3fe681620bdab6e5f3bdae221b99aad3c9 SHA512 cf2576c0ed33b7a3f2e25899cdf04db0826d772a487f55cdc3a5b6c70e2d16a51f76b3766ddf726fd961933d24a07ffcc96653a742d0ec66c4bcdccf4fe355a4
 EBUILD rspec-3.9.0.ebuild 616 BLAKE2B 5ee7420b2f39d491dd42555ffd63047cbfb40d598b39912210b37a09bc0e7f7ba633a2e4f3d53ebdc3e6658bd1fc869cdb08cb85b033bb8d18fb4814439924fc SHA512 6654d32e2f13da07e83513131653defd0717f63563c30e631e68bbb5d2ddb5dc00649b19002d94dfd5071a6af56c0234f595f4b53705929ea61e936cb615c8b0
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.10.0.ebuild b/dev-ruby/rspec/rspec-3.10.0.ebuild
index 76a4fb5eb6a7..39189d6443ba 100644
--- a/dev-ruby/rspec/rspec-3.10.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.10.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec/rspec-3.8.0.ebuild b/dev-ruby/rspec/rspec-3.8.0.ebuild
deleted file mode 100644
index 6ec99af3d2f6..000000000000
--- a/dev-ruby/rspec/rspec-3.8.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 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=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-core-${SUBVERSION}*
-	=dev-ruby/rspec-expectations-${SUBVERSION}*
-	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspectacular/Manifest b/dev-ruby/rspectacular/Manifest
index 5090e60dd7af..e74ed6c1cbad 100644
--- a/dev-ruby/rspectacular/Manifest
+++ b/dev-ruby/rspectacular/Manifest
@@ -1,4 +1,3 @@
 DIST rspectacular-0.70.8.gem 16896 BLAKE2B daf9b75be33ccf1b7d60a7aaa540b391578b7f841bb1999c52e566caf8000049d7b2180f372084be18bf4cf367f6c59dba422f187505e42ee6bd66e9431ed11c SHA512 6f048a7781bd672049c10687eede3e2218436ea396438e09814c9239cb07396df25f4b88ab78b98f91c66457c4aceaaf1a1b8aadbff748715a881cadff8dd2e1
 EBUILD rspectacular-0.70.8-r1.ebuild 621 BLAKE2B 91d9c0f815ed5b2e2b3831c6ffaf452ed945901945df21754fb5283bff60220ee68f54f2068562e98945d28143a97e2828a7cda22f48aa51f6ff548fb3eb77e1 SHA512 0c6676165f6fc19281a292fc2ba862c586313bef997b9cf782e268c89dd6854d6978c454513d1c9b85efe3fdde535d5754e59d7f18231d07ebcb14ca45673458
-EBUILD rspectacular-0.70.8.ebuild 615 BLAKE2B 2bfef25a844f1087a2447f140af439a825bd5cd80635cc626e7babc6d22edbe1062117e16a334e97701f871903f3ab5b34744ccd4aab3ecc163a8b75910206f9 SHA512 14e5979fb905d9144446a6edfe91e26b99ed0afd956baaf6edce190ef0a4d92e983e9a4f7f7737f4f017d61137328f89e14c6aebdce9f82d56f5607681da199b
 MISC metadata.xml 350 BLAKE2B 478dd5a6b615f4a0ca0217d2fd4daca21b8421cc34c61d4c4356788ed059edf68a0c9b747076060415d7e9a62e17008560f44da4d0909d3f68c50ea77f5629ab SHA512 78e3ba17336c86b92811af99283d12b0bc191a2f06d907d0c792aedc17d5a39d81d00acb4b884f074103cbca587c3961dace871fc82e4a9a3fc6a9190c48b75d
diff --git a/dev-ruby/rspectacular/rspectacular-0.70.8.ebuild b/dev-ruby/rspectacular/rspectacular-0.70.8.ebuild
deleted file mode 100644
index a7aa8bcaf9e9..000000000000
--- a/dev-ruby/rspectacular/rspectacular-0.70.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec support and matchers"
-HOMEPAGE="https://github.com/thekompanee/rspectacular"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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-oembed/Manifest b/dev-ruby/ruby-oembed/Manifest
index d8df02e3349b..5ac86221253d 100644
--- a/dev-ruby/ruby-oembed/Manifest
+++ b/dev-ruby/ruby-oembed/Manifest
@@ -1,9 +1,3 @@
-DIST ruby-oembed-0.13.1.gem 4509184 BLAKE2B 212cdb606a1155349c23c1c06f25fedbcc2436dc22a52c8f405b63e27457881617b41d79db15e92e5caac8094c7a9ea912f1b16d994448f5296d3c6117062f17 SHA512 d87f65f1d76d485488c81d4fa2b2df5580a03104a16e3af5e65e6987f4652b3f5652ebcb0a79eab882ef0e5cc9c7b35537032a849de7b848b609f13ca3b83dd8
-DIST ruby-oembed-0.14.0.gem 4510208 BLAKE2B c27df5f0cb48e64b754ecbf526dbb82efff66401ca28a9a45243c5e78397a114203a1a997545055fe2ef45c49bfcdc2005540af9b35b97b8f278e8a173211218 SHA512 101a9f8a35bfa5cd5fb7ecab1f8ee8b616286d6d880506c936ec20fb1749bc6c4ed7c61ebd9ea2247017567ca7e885dc9d83b38f3c55ed9e97a1b7cbe7e53d29
-DIST ruby-oembed-0.14.1.gem 4511232 BLAKE2B 7cb0bdd437c774dd87f4b4ca5234239a52b53cd1720eac6dc8cea75b792fdb55e4cb51c17e96498a4f62ce6b7cc078b7d92085b1ac59223bf8328209b6a071c4 SHA512 8cb9d74ece3879e8c1889df276f99173a35876f2e45b0786e698588ee3f4cc6a63195e0e42501fb3ccc9cee75dd3aeb4558a396a03cf9c4e215a2cf7baebaf2f
 DIST ruby-oembed-0.15.0.gem 4528640 BLAKE2B 3bfb6f6b7b23d82b89adad5b329072d050a5ff5dbf475f7443734c6a0cb70ad8c5a5d8cdc391e81a8a150d448454e3cfa8302a23c55a39cab8898c5d0fc53fa9 SHA512 9a97f292298ec0b030435ec4d63456b9eb6547de9cbe7b56cecc390cd8a5c374aca4aff2da4de3189cb0a75c6e1b0884c1fdf9c69d729d5a5436ed6e94d3fd2d
-EBUILD ruby-oembed-0.13.1.ebuild 795 BLAKE2B 35cf25fb62924a8f66d2296490e51499c7066e73d2b802b142712876822d91a9f4995c40828718429891a7bf25738690559081ec6dd03b1dc862589857228955 SHA512 d9f831c5f7030f153a9263d7cbdc75acc26f90b24a1b108b168a315e2c392536d506f20c7e3a1c3f526f656f236028fb88b755b479d5272fdc7f56f63e0e5847
-EBUILD ruby-oembed-0.14.0.ebuild 788 BLAKE2B 8f8cbd67da65b1e0dd1bf5a9f9c23a9880aab28d20ec1aa8336329b869a66d4460eecf960ccb983de08bb71c304eec93971228d37058c645c20c767246494aca SHA512 96c0f8e2d7e39e85e5287abf80807f20b3d6830fb076b2778c1d4e87bd712d060ef4b3a433ab44a2f57980df2a4f1a4e634d227c1622e1e756ec7f7c64d032b8
-EBUILD ruby-oembed-0.14.1.ebuild 788 BLAKE2B 8f8cbd67da65b1e0dd1bf5a9f9c23a9880aab28d20ec1aa8336329b869a66d4460eecf960ccb983de08bb71c304eec93971228d37058c645c20c767246494aca SHA512 96c0f8e2d7e39e85e5287abf80807f20b3d6830fb076b2778c1d4e87bd712d060ef4b3a433ab44a2f57980df2a4f1a4e634d227c1622e1e756ec7f7c64d032b8
 EBUILD ruby-oembed-0.15.0.ebuild 795 BLAKE2B 071152f52acdd5a673eb9e3be0f3ad898ee67d1a8506b3ef0f0c2ac019b47d896cb58be97ab233979df930b9c69de32bba8c1c56a8ede904949f9dbafac51bd4 SHA512 22af7ead72344821e7030393fce918429fa90b8789632ad1dacaada5b276570f3e7f202e38721025d5ccedfd25400851325acecaa2386fef97d7537f7ae93bfe
 MISC metadata.xml 345 BLAKE2B 575c6ff6aaa60be02f4afbaa5b6855e9e0a8e24992c7ae7db0f3f23856403c3f223a4e6c861550a96b967585bc0f7aaf937b2a98c6fad69fd6ab69466e98613c SHA512 e0c3ea7c1c5057b74e8b03b5d314050ee21f8a235dafb981888ebec4d8cf866d13723ac1dd6a96a685380f9b30e61c513e1f83328c778a524ecb52f9adee8e03
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.13.1.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.13.1.ebuild
deleted file mode 100644
index 32d0aa98300a..000000000000
--- a/dev-ruby/ruby-oembed/ruby-oembed-0.13.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An oEmbed consumer library written in Ruby."
-HOMEPAGE="https://github.com/judofyr/ruby-oembed"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test?
-	(
-		dev-ruby/json
-		dev-ruby/vcr:5
-		dev-ruby/xml-simple
-		dev-ruby/nokogiri
-		dev-ruby/webmock:3
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler but keep vcr version requirement
-	rm -f Gemfile || die
-	sed -i -e '1igem "vcr", "~> 5.0"' spec/spec_helper.rb || die
-
-	# Avoid development dependencies
-	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.14.0.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.14.0.ebuild
deleted file mode 100644
index 39b5682b5588..000000000000
--- a/dev-ruby/ruby-oembed/ruby-oembed-0.14.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An oEmbed consumer library written in Ruby."
-HOMEPAGE="https://github.com/judofyr/ruby-oembed"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test?
-	(
-		dev-ruby/json
-		dev-ruby/vcr:5
-		dev-ruby/xml-simple
-		dev-ruby/nokogiri
-		dev-ruby/webmock:3
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler but keep vcr version requirement
-	rm -f Gemfile || die
-	sed -i -e '1igem "vcr", "~> 5.0"' spec/spec_helper.rb || die
-
-	# Avoid development dependencies
-	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.14.1.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.14.1.ebuild
deleted file mode 100644
index 39b5682b5588..000000000000
--- a/dev-ruby/ruby-oembed/ruby-oembed-0.14.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An oEmbed consumer library written in Ruby."
-HOMEPAGE="https://github.com/judofyr/ruby-oembed"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test?
-	(
-		dev-ruby/json
-		dev-ruby/vcr:5
-		dev-ruby/xml-simple
-		dev-ruby/nokogiri
-		dev-ruby/webmock:3
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler but keep vcr version requirement
-	rm -f Gemfile || die
-	sed -i -e '1igem "vcr", "~> 5.0"' spec/spec_helper.rb || die
-
-	# Avoid development dependencies
-	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 04b2c46f29ca..4aa2f5f58746 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -7,6 +7,7 @@ AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716
 AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1
 DIST rubygems-2.7.10.tgz 863618 BLAKE2B 26a453d2808cbf03caa6f2ef4a829418de58f4ed0c7584935a0ad5fc722d7fbdf9f442261f96fdca4b6975b62608965d2f0053d3046da59771be373bed21154a SHA512 48a18c0f202f463c38cf5dafecfbc7cc39245e63c7a059ef2cefadda478483794a929ea6b7e0ef062dd4423230746f1f09d7bec06a97fe3ceccc3325397a3e71
 DIST rubygems-2.7.11.tgz 861642 BLAKE2B 6632296d8bcd47d52d92db3c09a0d95118c72877c712a9bfa01f4d4c8aff1bc62ee7e663f763a73b2c2e3dfd2d261ea965ff932a77b84f70e63fab1445d19d8a SHA512 83592f4089a768f6d58be975995855ad3aa6b481de5e2d31789d1c8d96a33f5347a914e5d7450819bb2e8e434ee65c4d3f5c978965ccaefad6c167a29801b7bd
+DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e
 DIST rubygems-3.0.9.tgz 886153 BLAKE2B 942f641c7dec30d3dd2f0756d04b1b6b071f5d3b5a9481c406e51ab125fa9da0e4e1ebde79c6a663e8847125c1ed8657f6af69000cf0d7191360e7aab99ba508 SHA512 1a6d7b3b08024d95988e033c772bfb6b5ed8f94ff4ddb194280bd3a7530cc384cb90fd56d44b6d56760cffbb23c5a6ab5917737ca46ec85fe61e1ae79d7ba4ca
 DIST rubygems-3.1.6.tgz 996339 BLAKE2B 8dc242a64c6f934b876de841cb6ea86455d7754cbe3902620a10ac40bb97264c03c1002b45a5734d1882617d95e8b390873ed390d00fe7e54b6d8f11a301c2b3 SHA512 730381cf683cd57f7ea7889f63cf21abb699bf28d2a25fa63f510756ece285cb63e4208130c20fa7c0232d6093d869e5d99d5b5fdad9bc68be5e8ead21863d97
 DIST rubygems-3.2.11.tgz 987152 BLAKE2B 589c862ed4ae14d66437587adfbe9c57e4b95b8911115425098463f7be77a597cb9df3e3962da58da3a12139799afca34ea002983cbd4406947278c7db9e8e41 SHA512 686d35175891cb098c1efffc957296af6526622882560c8ecdc19eff19f50a5769fc7df122c2a863cfd17b09c375a70f8e554345cb50075693219d68ae81edfa
@@ -14,6 +15,7 @@ DIST rubygems-3.2.13.tgz 987809 BLAKE2B 20243f6b81592d62f033ec96485f8b6af6693c28
 DIST rubygems-3.2.14.tgz 987419 BLAKE2B cfd1545f022194f8b7a99b1698a38d4cfae08b8fe25c45fc7b7c935953ec7a66b0b00f21f77eefe757226d80f19a2093f2b85767e5caabfe13f445fbf6dc5508 SHA512 de28bdfdc239cd49bb5a1f78f0a9e3ec432fb70c8326c7899f7ef0a088f60becd99ba81285b20388296f96afb46ca3ca359208621d88a6be68b7388d155a2383
 EBUILD rubygems-2.7.10.ebuild 4513 BLAKE2B 324e63a6f09a1b3deed3b0911fb4838ca7369f26750da327548bbda070877deea4f4428f22fddf524480c21dd1eaca29c6f8d3cf392c5fd87a5608d59dad1115 SHA512 e9a51c8772490a9bced46b0279fdb7b35d1204297e4fcdab700414495fbb0ebadb583dfc15e0c3a68a3a8897f72863c958e1476597b0707591c5371ae29b1560
 EBUILD rubygems-2.7.11.ebuild 4521 BLAKE2B 8b28842aed8ac1c6387fe52b2639b5afc42c70c9f2222d9567068f173140ffcc51534899e0e0d0ac132e6a1e395126838e0a7b82a17c8ff5c09829a2fc02a017 SHA512 e9dc2072951259dfe568eead50b32aa6bd28515e66926a18568f85d330b05d2d900399ac3a506254fbca9f4dea49064a5d517e4e4de9e7c60929477ffb953d42
+EBUILD rubygems-3.0.3.ebuild 4646 BLAKE2B 42f400a5286dea3ff7aa5f3739f7d259ba56bb147d8fdcc5644ec583d0ea98fc7337bc3e9def844a293d09a8bb9745184822b09f7d7c6dc71ec0689e3bf44166 SHA512 4d86e443da752f2422437e9426cbdd32cf32db2ddc7bc36a20f382c4756c9251c96e79e581b93ba2764bece593c95a0c79b7a1063c2c202aec4afd58f0840752
 EBUILD rubygems-3.0.9.ebuild 2635 BLAKE2B 45c6fa75ffd962eebe61fa8fca8a7867dd0cacd5a0503d3ba946cb1f13b0f00f54a90adaf0d069c2550d510e912fa2619cbcbb6b1f65421075062270fc7bb367 SHA512 e2c67911e5a521cb630bdd071d0dadab5a775e965918cf73fa3f3f8cfabfaa81a64d2f189c063d72689d9f6a1453f61a95044c52d9f3f4e36d3b91f3e97225b0
 EBUILD rubygems-3.1.6.ebuild 2847 BLAKE2B 661f1e1035c989668cb24642cab1cc444af53595b77ace9e9977a502316deb71b5f5d61521b4480390d8fed1066ca3d0ccd920b21c98251020d50645235ee1b0 SHA512 30aeb16df265eb4e627600071b5057d1e831fa2af1a005db6da2c741385bc6646f4eeea809c0c879f068b7d48b61642f3e4abd50812cf170dbc787fa5c1da328
 EBUILD rubygems-3.2.11.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
diff --git a/dev-ruby/rubygems/rubygems-3.0.3.ebuild b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
new file mode 100644
index 000000000000..ab3a8fd1f2eb
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rdoc
+	)"
+
+all_ruby_prepare() {
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/assert_self_install_permissions/,/^  end/ s/^.*RUBY_INSTALL_NAME.*//' test/rubygems/test_gem.rb || die
+
+	# Skip tests for default gems that all fail
+	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
+	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
+	sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
+	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
+	sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
+		test/rubygems/test_{gem_installer,require}.rb || die
+	sed -i -e '/test_\(load_default_gem\|default_spec_stub\|self_stubs\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
+	rm -f test/rubygems/test_gem_indexer.rb || die
+	sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^  end/ s:^:#:' test/rubygems/test_require.rb || die
+	rm -f test/rubygems/test_gem_commands_setup_command.rb || die
+
+	# Avoid tests playing tricks with ruby engine that don't seem to
+	# work for us.
+	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
+
+	# Avoid test requiring network access
+	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
+
+	# Avoid test requiring file system permission changes
+	sed -i -e '/test_traverse_parents_does_not_crash_on_permissions_error/,/^  end/ s:^:#:' test/rubygems/test_gem_util.rb || die
+
+	# Avoid uninvestigated test failure in favor of security release
+	sed -i -e '/test_self_install_permissions_with_format_executable/askip "uninvestigated failure"' test/rubygems/test_gem.rb || die
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc History.txt README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(23|24|...)"
+	ewarn
+}
diff --git a/dev-ruby/sass-rails/Manifest b/dev-ruby/sass-rails/Manifest
index b99306bec348..3e10b619186f 100644
--- a/dev-ruby/sass-rails/Manifest
+++ b/dev-ruby/sass-rails/Manifest
@@ -1,5 +1,5 @@
 DIST sass-rails-5.0.8.tar.gz 90020 BLAKE2B 20e9e6e4701b0a14ff10f343fb94065af0110d86aab1bb4676de4806e20f8031b4cf7961002828438c3ae6be9802b3a2e4367882241e8fe745029747d31f9b04 SHA512 05d9e8d269c608723158831e215599a8482383fe79a9c3416fa8efd11bf9bae7935c5b7a1f5e8a22a85336abf4ceecc50578f0c8e51310c09b2540831959652e
 DIST sass-rails-5.1.0.tar.gz 89994 BLAKE2B dc0083af8399d2ff1210a6430d47ccaaac88b337da5cfeb61c7a4f0c6b1f55d59d896a874945a943cc322fabfb3a31d80a1a467a12d04f2c1a1f9c84cbb452a0 SHA512 894b957b6b72d340ef2eebdc721c58c2d101fd275a10265f859f17f654736b3d3542a7100db922236925af40ae090406689815a4bb4f623c5f70652685571b7e
-EBUILD sass-rails-5.0.8.ebuild 1063 BLAKE2B 9bb06084291bd50bb665aa3cdf62e3836e8fa685ba171ef9cf76af433168fcc27e96b3277600a1b1c66818240d69b07c84c58d81e28b87ae2937fe993f49964f SHA512 124330fcbec04b8c36a170e3f562f3ef556d5e4e29f77d24e97be61e67b6fa20f0ffb38a7687c3fd05aa985945c917763f19dd75f31bdfc9b0d4d8e6db348ba6
-EBUILD sass-rails-5.1.0.ebuild 1063 BLAKE2B 9bb06084291bd50bb665aa3cdf62e3836e8fa685ba171ef9cf76af433168fcc27e96b3277600a1b1c66818240d69b07c84c58d81e28b87ae2937fe993f49964f SHA512 124330fcbec04b8c36a170e3f562f3ef556d5e4e29f77d24e97be61e67b6fa20f0ffb38a7687c3fd05aa985945c917763f19dd75f31bdfc9b0d4d8e6db348ba6
+EBUILD sass-rails-5.0.8.ebuild 1063 BLAKE2B 0b7b2824bd31277ce1028080b495480b6e49431141266d461e08e54a6bbafbbf0da22c3712e5d9ed98cc4b4ea89ef728fe8ebe167c4118db57d85bd54a6026a4 SHA512 42d0651e8a5ba3b2cdd51e505cf125558a01bac9880b5dfbf63c528efad45f550ac6822b15116f54993db99c1524b6f0315af9555dc3268bc0b2330cd3d30c06
+EBUILD sass-rails-5.1.0.ebuild 1063 BLAKE2B 0b7b2824bd31277ce1028080b495480b6e49431141266d461e08e54a6bbafbbf0da22c3712e5d9ed98cc4b4ea89ef728fe8ebe167c4118db57d85bd54a6026a4 SHA512 42d0651e8a5ba3b2cdd51e505cf125558a01bac9880b5dfbf63c528efad45f550ac6822b15116f54993db99c1524b6f0315af9555dc3268bc0b2330cd3d30c06
 MISC metadata.xml 342 BLAKE2B ada4b20d7341b3ce1b6062b13b4e2e3bbeabd0d5c1532a1d488ba4d25b4de5b940e2632a84ba7a4fddaa02439308dd0c39d993991a3f29f45d4e6bb5a2c66a84 SHA512 92d0e35a64810351db2a1d71d32b1c93cefd2689eee3bc4eb275c9fd016aad8fdfaeb0ece230a5da7d2158f720d6715d2f15b14bf3c7e80c0211ffc895863920
diff --git a/dev-ruby/sass-rails/sass-rails-5.0.8.ebuild b/dev-ruby/sass-rails/sass-rails-5.0.8.ebuild
index ab579a6f00bd..f9e3ab5413f8 100644
--- a/dev-ruby/sass-rails/sass-rails-5.0.8.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-5.0.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/sass-rails/sass-rails-5.1.0.ebuild b/dev-ruby/sass-rails/sass-rails-5.1.0.ebuild
index ab579a6f00bd..f9e3ab5413f8 100644
--- a/dev-ruby/sass-rails/sass-rails-5.1.0.ebuild
+++ b/dev-ruby/sass-rails/sass-rails-5.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/sassc-rails/Manifest b/dev-ruby/sassc-rails/Manifest
index 6f667490363d..a46161bbc6b0 100644
--- a/dev-ruby/sassc-rails/Manifest
+++ b/dev-ruby/sassc-rails/Manifest
@@ -1,3 +1,3 @@
 DIST sassc-rails-2.1.2.gem 33280 BLAKE2B 1ecd048a879ea9ba08390ed81c679a3a4461f3937d1b0ce5ee001810067286f386ea885787984ffa417d2af191f178563e892ea24f1b466b6538c815fadbd9e3 SHA512 d250f22a3f2c4afb56a22f4533194d80b8a301730e5e4b49f9613e489f7158e7bd9c02cff8e1ec8ce727ede25f1c03a2613a664291967b5e97e210f7890d0bc8
-EBUILD sassc-rails-2.1.2-r1.ebuild 905 BLAKE2B 31691ff99abfbf6377142f8545b8729ea4e935920be861d4b0be7c3b51192291fdac7207dc294e405925c68d72ccde205822d1c7f168d64717cf8ffe19e4a549 SHA512 9a6a922da7333be0d6394cec9091aacf03b032c87ee525bda3caed54c7a417558de36b693775d17577e29d2789b0cf133f5a2671a575c6d36db65ea32e6caf35
+EBUILD sassc-rails-2.1.2-r1.ebuild 905 BLAKE2B d9c76d88987efb8361d78628c075d5bc9707c074ed740e5a4d5c482f9f1c87638d502d35c7db882838a7b57c33d41afee821bcafe235e6d4d689f33e8bf45cb9 SHA512 ab8b83fc5c46c2e617c68ddb6d58e51111ef5bb3d7c987f238d0393fb2ceb718cc10d51001489148ec9150299de1dd9d3c334ece5749b3f08e18837046979d98
 MISC metadata.xml 342 BLAKE2B b460bdd1f19ae844f16c9600d7ffe9c737fe0812e88d35e572eb75d616b2aa6392bd0fa83eac92bd349503f5d72d39da3317b57415c38d121c705f09c5317338 SHA512 ee5b3763d54c109df23d6acdb840d71569d9405884bec4fb15de75d6fc66f68a5e40a8b873dfecab98e6c1f7e47cea4f875ac842d1f0d08cf5fc6cdcb0828312
diff --git a/dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild b/dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild
index 54f5843763ad..0b7eee92eff3 100644
--- a/dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild
+++ b/dev-ruby/sassc-rails/sassc-rails-2.1.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 3b3fd9b9209c..a456d5261e36 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,6 +1,3 @@
-DIST selenium-webdriver-3.142.6.gem 864768 BLAKE2B 6d48561c4d50c64936cc0ec55a3f777723062f8ea1fb08f345e2c84d0080dd6a04b09e13caa23b77041c91dd2de9ae80980562f5f3a286992f0296a8e19adc75 SHA512 1a34c504214ac662195a6d0addcda8fc2de6d863aa367fd9d9b973bf7dd44699e4776fb52cf7c3dbaa16ebd87c427bac6c3747ad469a5b07e4cace7e02416e33
 DIST selenium-webdriver-3.142.7.gem 865280 BLAKE2B 650011848afaa3ea4fab7c8172828c7562df212383a8fbea9615a5136e3382aba0fcf17952d941c7b514e5229c0aafe3dbc320386698eb8756f567eff67722bd SHA512 0e7891c19b8a0b20441d85bc17032ecf03cba7ca435846e03abc50b62b0c53c075dc70456796c9bfcd1ecd28ecc517f907a3d6868346a07617fd1d0c1b9437c0
-EBUILD selenium-webdriver-3.142.6.ebuild 914 BLAKE2B 0d9273090a43a66c935e7e8d0844e910a68b5756f6f7d67f46786520b15dfdcdd33e6682a17a86c2c72721a85002364141efbbae2222334ea4e4978fb516315b SHA512 5e19bde871553bcd9c45207dbf6030c25ba1370cc32361f12286cccd13ed7de7e659aea31f2d817a76f072867f3eababf6634cd5c78a984f5271e70ab3aca531
 EBUILD selenium-webdriver-3.142.7-r1.ebuild 1105 BLAKE2B fbd7aec91d8f5eae4a45a29c01309d7facc0e3a73ffeae3fc3a5c81b3ed551d2fbe70f61ec52225f07fa709c80eea8bec13153ac7a1484d6334b8df752c2e74c SHA512 fcc13f25d587994c569c9f7ae6da5430d50a032a7ee13fdd5010d4c9de0da97cbb188760adc059bdc2e15ba6568ee4ac18c0a82af61053b7d425f26300f2f8b9
-EBUILD selenium-webdriver-3.142.7.ebuild 922 BLAKE2B b41dedf18bc905f1b30edb8396f005255331694a8fb064d4c966671c0031525b7d5c13166baa57c5346b3af5a578d5a38ffb23f2dffeb2d3e83234aa4ca8949f SHA512 92405c0e556374d125de5025731ae09ab988ba8658fd47d14c457b601185e3552f13cf266af280bbd4905c41e37c816fd366139859d67c3f302baa1808228faa
 MISC metadata.xml 335 BLAKE2B 8ef78917e56590730261a00ee72b35e28e5f21b9327d0cd48723d10e31797986ea713b46380165708c999836c6d2f612703c08008ad85f652ecf9ad4f22e8549 SHA512 6ff71435a48b67cf35a3dad502a8e62f9dc437e096b91dc09cdc2e0487b39e2260e67ef968b91970a2609f99eee6adfe42932c42aaee382a617fb3be06b74c15
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.6.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.6.ebuild
deleted file mode 100644
index b88b9685d7e0..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.6.ebuild
+++ /dev/null
@@ -1,33 +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"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5:2
-	>=dev-ruby/rubyzip-1.2.2:*"
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7.ebuild
deleted file mode 100644
index fc0ae13ab285..000000000000
--- a/dev-ruby/selenium-webdriver/selenium-webdriver-3.142.7.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 ruby27"
-
-# NOTE: this package contains precompiled code. It appears that all
-# source code can be found at https://code.google.com/p/selenium/ but the
-# repository is not organized in a way so that we can easily rebuild the
-# suited shared object. We'll just try our luck with the precompiled
-# objects for now.
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
-QA_PREBUILT="*/x_ignore_nofocus.so"
-
-inherit ruby-fakegem
-
-DESCRIPTION="This gem provides Ruby bindings for WebDriver"
-HOMEPAGE="https://github.com/seleniumhq/selenium"
-
-LICENSE="Apache-2.0"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/childprocess-0.5:2
-	>=dev-ruby/rubyzip-1.2.2:*"
diff --git a/dev-ruby/simpleidn/Manifest b/dev-ruby/simpleidn/Manifest
new file mode 100644
index 000000000000..63682b9d9fe7
--- /dev/null
+++ b/dev-ruby/simpleidn/Manifest
@@ -0,0 +1,3 @@
+DIST simpleidn-0.2.1.tar.gz 204644 BLAKE2B 4c7f82af2ddaa753c8df91f80776b2b00d3a8a8dfda95c9012ebc3e5eea6503fbb0f20a7f79f8c624612e433b0e61cec79bc6a147ef6a04d418cbff72c31c867 SHA512 20a81ea5bca503b167cd2183f762993454a5f7fe082639b70234521f8cb9e4533b1f5f22dfcac18108c90a461185b13fea55f6197ab4c5996116ac359adf5033
+EBUILD simpleidn-0.2.1.ebuild 821 BLAKE2B accedc61cf51d4a33129ec15d93395d3c66637ae8b260f0ef78b66c2db5283826ba7aa8d716580a7fd4b4ad7f173ad056ee8d2a8c16a05b0d7f508f4f4e2860f SHA512 2f02c2009c17a1e04b461479f52bf2865bf5d1d9a10decd186c0c6033efcc4591edb40b735569ad8b3ea05bcd7d29b49e41495ff7dbc5711b7c9fd1cc11132a2
+MISC metadata.xml 332 BLAKE2B 78418b3ccf476ca37796b952dabf3d685564fa862fbf17662bcea1cc05c847de1760b145d272a0cadf7ba66431e2c2c382c84bc5cd84a9b332e179676bf2fb69 SHA512 82b171110796fea6ff5c7bd2489f7794dbf506526100452ae58e889849d15aa08e24f77b6e6cac414bbef8f050c03e842c16fe109326b3adc9c096d5eebc0990
diff --git a/dev-ruby/simpleidn/metadata.xml b/dev-ruby/simpleidn/metadata.xml
new file mode 100644
index 000000000000..6668e58af2c4
--- /dev/null
+++ b/dev-ruby/simpleidn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mmriis/simpleidn</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild b/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
new file mode 100644
index 000000000000..f446bb84e2af
--- /dev/null
+++ b/dev-ruby/simpleidn/simpleidn-0.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+RUBY_FAKEGEM_EXTRAINSTALL="tables"
+
+RUBY_FAKEGEM_GEMSPEC="simpleidn.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Allows easy conversion from punycode ACE to unicode UTF-8 strings and vice-versa"
+HOMEPAGE="https://github.com/mmriis/simpleidn"
+SRC_URI="https://github.com/mmriis/simpleidn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/unf-0.1.4 =dev-ruby/unf-0.1*"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/spring/Manifest b/dev-ruby/spring/Manifest
index 47ea1c4bf3df..2878edebfeff 100644
--- a/dev-ruby/spring/Manifest
+++ b/dev-ruby/spring/Manifest
@@ -1,5 +1,3 @@
-DIST spring-2.1.0.tar.gz 43499 BLAKE2B 0736706638b0b8c76d244d5cc18b17730f807e6c87384c7823a71d9878a55337de8ab07ce1c75fc0ce0eaf3798df31d1c38f9c3fdac7cc4eedb84e1cab4eb27f SHA512 9c396cc55228f3afcc291f51418621071991d965312068dac88a940281d5df42239275a7da2f6a16801086b89e05477fa474705020060b1c4051baddf1305b05
 DIST spring-2.1.1.tar.gz 44000 BLAKE2B b7a5855b4a53852ccf82c14e82c134e61bc17a26e20bbf3597259763bbe81a545d3299d5490302681ca616ed1b7f4d42d522134b87d8a40588aa4904f8b650b2 SHA512 44c8619253567d2f506c9652ac28da5933517113dc38e8eb5a8b58fcc7d28ff0192cc98a655579767972649f5cead63cff0c7aa909046b41cfc1d37780e0ee77
-EBUILD spring-2.1.0.ebuild 837 BLAKE2B 3b0a207250e65da3cb3ab0e3c09b40f74fc69e2cd074e40807390b4f59bbc49b78a20263070a2bd4c8d8783f0e81d8777e1a6aee369141174fc76f49aa4113a4 SHA512 ba215886a78558a262313d7f9187cded228f099369fd98454dc60dea506d77fdd78eb49922512df33b88839f7627e567b4244bc0f30ed06e149345184c0bf43e
 EBUILD spring-2.1.1.ebuild 876 BLAKE2B 2188cc38d99d35b40228ab9f6d5de447784f97132b823e16f1975e68055776615584c942bbb5b68a5343b6b40839d839765bd09aa21a1744e5240836308d2ccc SHA512 c4bf35ae919e5e1a07c036db63ecf4b63a622986d79b005a565b9d34174df64660ff2846e7e9b2f0e6f1e0813a3e6020e4be70827a29ea12c9ccbb665e406f1c
 MISC metadata.xml 338 BLAKE2B 6800daa1cad935214edb5051dac7470efb061ef6fc0ad534b8e52d024ffc8474fe3a04a329de4394b7ce673a9e8bae71aee52fee2fc4def484c287085ae51c5b SHA512 ed274c75491299ebefa755f0776c8895c7640101c22652f92defadb839d0a476a0e00ad407d1769a62f20d56da532f750bf639e7f5d75831c50f2957c17cc9c8
diff --git a/dev-ruby/spring/spring-2.1.0.ebuild b/dev-ruby/spring/spring-2.1.0.ebuild
deleted file mode 100644
index e05aac895e87..000000000000
--- a/dev-ruby/spring/spring-2.1.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rails application preloader"
-HOMEPAGE="https://github.com/rails/spring"
-SRC_URI="https://github.com/rails/spring/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2:*"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	sed -i -e '/files/d' \
-		-e '/bump/d' ${PN}.gemspec || die
-	sed -i -e '/bump/d' Rakefile || die
-}
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 911f7df4c498..a17fdc75c50d 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1,8 +1,5 @@
 DIST sqlite3-1.3.13.gem 64512 BLAKE2B a36e3161e44004a0510297d16bf491df3dc29434432208ad231f5e46ddecb4607add417e105f5ae8472a768f80efef3f74b703b2a441396b4c9b6c9ff90bf31e SHA512 5d3eab7c788cc62c497de179919054324e53595294ec3a9df2a10d23151a406ee9a88f1c3ac945777f138e78cec61018c388b023456b873131d678a6788a505f
-DIST sqlite3-1.4.1.gem 70144 BLAKE2B 5a850296c804223cfe7673f72a1e303fb80c49569f23ab57be9a26acacbe95945382db1b1fd22bb432c974ddcf7c28abd913912823c2e8477d2eda165dbafe0d SHA512 33f87af2e962459cad07f2f07c9d6dffb59551c4e5371e47446f10f5314a05da495598ef5f90f896f876f9a59bd2e90b5bb3fdfb6efb95966ff51bb578f81a80
 DIST sqlite3-1.4.2.gem 70656 BLAKE2B ef7fa7667fd080a6f175bcfbd1fe8dfba00d3fdf1214cc3d776f0576dc29386b627db8d6c0dd06f07ab65fff877a6803a6dcacefd4fbc5bb0f7d2149e355c88d SHA512 c4630dd2fa13914e2fcc70092c35568103f61f976958b439fe205abdfcff61702ca176d10bea40ff0cfea3169644cdb9146b7be94dff883cad3b753e84629545
 EBUILD sqlite3-1.3.13.ebuild 2376 BLAKE2B dbb2328f0a3e5841f82a9e7addd26f27ab1701b1e3922a3045086eebf4a4a375b730284e882c053876b64915306ce5cf9f0fed5784c393eec60d3c5ea1945e9b SHA512 d87078412a9e1fedb78875299b26474dee682acad58887eebd1af30e6e58b4ae8d1ec564354c480b098bb9c25f8e269c05da518d91781cd23c99ce8352535fe5
-EBUILD sqlite3-1.4.1.ebuild 2420 BLAKE2B 47ec50b69f2a4fd4b05322171b5f47fafc00326f457ab05036f03d969d4f37bbc0f0c48aa19f00798c87bc125242ad0f6d15c7fc6c72ac9ae198576caa358a5e SHA512 fb2edd78cc49e38ee2f403da052b53099a32e5adf499653707ca640caf8a93c3019617f2a36d134a4fa93a5c0ae427500522d5d45d5f846a828507c7a5624ea2
 EBUILD sqlite3-1.4.2-r1.ebuild 2336 BLAKE2B 54043ce684b10aaaa98598bf7a9792394acdd3cb80967c324d8043d83ed5bda283543b54d47398d3bdefac5cd95b5be518fc75d1ef22e6d944d156bafd62db90 SHA512 41eb6ff645bdc325bcac8faf6cb1daa072f9d8ab26811b79c4105b6c48787e16e0b3d383b83ce37477ffc53157584c9784813f13e5c6009cdff17e2a7dc9802e
-EBUILD sqlite3-1.4.2.ebuild 2427 BLAKE2B 6223fadeff863d6ebb5a93c179d8f2bdce8edb69c35dc0f66c3114151ab69cb845f8476d604af1a9cf7731951ac7d7d75a95a8f58beb0fd2a9202cf7758493a2 SHA512 94fe7b990789f9b9a49a75075dbc34ef2b075436883fc3421f6cfe332f991cb5bfe199df0f8f94ab15206ab95cc71feda34f0833b52a0654de9b99df600b6e0e
 MISC metadata.xml 342 BLAKE2B 1f46148873c3913fc0beee10dfd433f84a477f2f5ba8b7a8bc97e4cac6765d3c07829dabef7e697791cb42902184fbf034c5701a433717c1516c725c0b5b48e9 SHA512 3272f121743335cd749a606648660e8650664fec4f02aa6499c8f5ebcf0ff727de28619d800fc5cbda350f3076e81dfbd1993ec825cd4ca43163e160813b3f77
diff --git a/dev-ruby/sqlite3/sqlite3-1.4.1.ebuild b/dev-ruby/sqlite3/sqlite3-1.4.1.ebuild
deleted file mode 100644
index db26f1c3ce72..000000000000
--- a/dev-ruby/sqlite3/sqlite3-1.4.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC="faq"
-RUBY_FAKEGEM_DOCDIR="doc faq"
-RUBY_FAKEGEM_EXTRADOC="API_CHANGES.rdoc README.rdoc ChangeLog.cvs CHANGELOG.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An extension library to access a SQLite database from Ruby"
-HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND+=" >=dev-db/sqlite-3.6.16:3"
-DEPEND+=" >=dev-db/sqlite-3.6.16:3"
-
-ruby_add_bdepend "
-	dev-ruby/rake-compiler
-	doc? ( dev-ruby/rdoc dev-ruby/redcloth )
-	test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# We remove the vendor_sqlite3 rake task because it's used to
-	# bundle SQlite3 which we definitely don't want.
-	rm -f rakelib/vendor_sqlite3.rake || die
-
-	# Remove gem tasks since we don't need them and they require hoe.
-	rm -f rakelib/gem.rake || die
-
-	sed -i -e 's:, HOE.spec::' -e '/task :test/d' rakelib/native.rake || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/sqlite3 extconf.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "${P} Dcoumentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
-	fi
-}
-
-each_ruby_compile() {
-	emake -Cext/sqlite3 V=1
-	mv ext/sqlite3/sqlite3_native$(get_modname) lib/sqlite3/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# sqlite3 was called sqlite3-ruby before, so add a spec file that
-	# simply loads sqlite3 to make sure that old projects load correctly
-	# we don't even need to create a file to load this: the `require
-	# sqlite3` was already part of sqlite3-ruby requirements.
-	cat - <<EOF > "${T}/sqlite3-ruby.gemspec"
-# generated by ebuild
-# ${CATEGORY}/${PF}
-Gem::Specification.new do |s|
-	s.name = "sqlite3-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load sqlite3"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-	RUBY_FAKEGEM_NAME=sqlite3-ruby \
-		RUBY_FAKEGEM_GEMSPEC="${T}/sqlite3-ruby.gemspec" \
-		ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/sqlite3/sqlite3-1.4.2.ebuild b/dev-ruby/sqlite3/sqlite3-1.4.2.ebuild
deleted file mode 100644
index afd7d3af6e3c..000000000000
--- a/dev-ruby/sqlite3/sqlite3-1.4.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC="faq"
-RUBY_FAKEGEM_DOCDIR="doc faq"
-RUBY_FAKEGEM_EXTRADOC="API_CHANGES.rdoc README.rdoc ChangeLog.cvs CHANGELOG.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An extension library to access a SQLite database from Ruby"
-HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE="BSD"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND+=" >=dev-db/sqlite-3.6.16:3"
-DEPEND+=" >=dev-db/sqlite-3.6.16:3"
-
-ruby_add_bdepend "
-	dev-ruby/rake-compiler
-	doc? ( dev-ruby/rdoc dev-ruby/redcloth )
-	test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# We remove the vendor_sqlite3 rake task because it's used to
-	# bundle SQlite3 which we definitely don't want.
-	rm -f rakelib/vendor_sqlite3.rake || die
-
-	# Remove gem tasks since we don't need them and they require hoe.
-	rm -f rakelib/gem.rake || die
-
-	sed -i -e 's:, HOE.spec::' -e '/task :test/d' rakelib/native.rake || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/sqlite3 extconf.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "${P} Dcoumentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
-	fi
-}
-
-each_ruby_compile() {
-	emake -Cext/sqlite3 V=1
-	mv ext/sqlite3/sqlite3_native$(get_modname) lib/sqlite3/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# sqlite3 was called sqlite3-ruby before, so add a spec file that
-	# simply loads sqlite3 to make sure that old projects load correctly
-	# we don't even need to create a file to load this: the `require
-	# sqlite3` was already part of sqlite3-ruby requirements.
-	cat - <<EOF > "${T}/sqlite3-ruby.gemspec"
-# generated by ebuild
-# ${CATEGORY}/${PF}
-Gem::Specification.new do |s|
-	s.name = "sqlite3-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load sqlite3"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-	RUBY_FAKEGEM_NAME=sqlite3-ruby \
-		RUBY_FAKEGEM_GEMSPEC="${T}/sqlite3-ruby.gemspec" \
-		ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 4b9cee68466e..c5425bf4ac5d 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -4,5 +4,5 @@ DIST thor-git-1.1.0.tgz 98252 BLAKE2B 1537cfe6e7cc0d92cc8bde56f0e2acf06b6ee4cb36
 EBUILD thor-0.20.3-r1.ebuild 1436 BLAKE2B bd76a7a658afdff2e6a60ceb5be8ab977eb1b67f4825e86d216c0d39c726445c72b00491c338c8a4604f8bb933e11d60228abc2d4f2a4328cd9d5df879676663 SHA512 bfdd0f4c287a8376afb4bc661ca56c7773a7d3edaa0ff443bfdab53913944813bb2f25ee60b96eda9cb9256675bd80e2ceccd436040a4f1c1b35bd9e12b84944
 EBUILD thor-0.20.3.ebuild 1440 BLAKE2B 905f7bd1cd95ff41fd11e1df498063595634b75a368610521b7965470d1039654d39023f8301e5f3a9d196a48473f9898532227f584d311c95948a19781046e0 SHA512 515bc470d08ba459e00c8ec1f605090fed982132b29dccef1834159145542381d08e3101e625cee46bb864e26be3151a1586f5a41d26eac635b55e8f961802a9
 EBUILD thor-1.0.1.ebuild 1585 BLAKE2B a230df8fc7a52de052611cd2f8816e4b4eb008867dc827ce0f89435daeba85a4903fb6900ce395682df834b28f0dd8112be8adf4e2cacdbb69d4925a4f193b79 SHA512 dfba72978896b7983cec71fc386d39788c363b58df008170aad15e52fdff7c2832a47ad3d382f6a178ef0c6d473e8734787b4d9fe6b596a961889a7a5f97b407
-EBUILD thor-1.1.0.ebuild 1718 BLAKE2B 687c7121aaa702a62f4bc12cd6f34cd98a0d667aa8e9bc58837ec8cbce4ef777a0bc03640aa7fab838b6e7fb84835c0617efa4dde6a421f2a2c2b1162201628e SHA512 8bef0eca6d5e5a08146b3fa9e1539b5b537dfac1b374deb13ef7177d5b3a68ff3b02ff31115d507f4327fe1e9aeafb77cb2a0e9f0dcf2fb771712c137453c161
+EBUILD thor-1.1.0.ebuild 1717 BLAKE2B d498507e2057bb54a174416c5ac3b30f71b1d7cb63f157c5a8d52f476135aec51ac5dee6d23b059bff47f089014b1469954869fdab8bf1cc0b721bb319900b2c SHA512 2d271505621c588b2efbefd323e7970cbc3360210634c2bef6af4a6e40e1917aa565d4d333bcb0cccde2547e7ffed5c734a53975def86064ff71b743aab2bd9a
 MISC metadata.xml 680 BLAKE2B d4b03ac058de229b055e01ee99da7745a8fc67200979f626b55d6156d573269bb260c42ef44d6dd3b391a3e06d46844ef3fcd7cdd1f0d4053957c00bcfb1fd27 SHA512 d4938ad6ec003fe17d09274f39a2526c84d69d447b1e8063e9301000b776496fb3f8fd6d7e596791d9f8d05714e856d6a6d8df2c5c4747420e3221edf48ab264
diff --git a/dev-ruby/thor/thor-1.1.0.ebuild b/dev-ruby/thor/thor-1.1.0.ebuild
index db53dd7fc80b..765d991006ad 100644
--- a/dev-ruby/thor/thor-1.1.0.ebuild
+++ b/dev-ruby/thor/thor-1.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="doc"
 
 USE_RUBY="ruby25 ruby26 ruby27" ruby_add_bdepend "
diff --git a/dev-ruby/timers/Manifest b/dev-ruby/timers/Manifest
index 480f8c6e3d58..be4179d8c7fd 100644
--- a/dev-ruby/timers/Manifest
+++ b/dev-ruby/timers/Manifest
@@ -1,7 +1,3 @@
-DIST timers-4.3.0.gem 14848 BLAKE2B b6dfa758b8b16fbc2a28da08df05ade4551d398cfcf1ce09cc080dac4ac6adda4e741a9c5dc89d71594fbc81e5b55303556b012b03bd836ab1f63f0565acafc4 SHA512 6783424cf79f7f36292198621f93e17540e93011146c3a33b1b14a118c31a508352e56e479e3df8d9692c6f95b366561f27b374611851e88ad3fb6bbd1606037
-DIST timers-4.3.2.tar.gz 10741 BLAKE2B 2f04c012f161c3af53103e5c5f05da53f089b2db2b356cb271f3ad318c2b66d78a2275665b27fb718dfeab7e8f76993637153eae193616f84f3da1c3db42680d SHA512 306669da275e26f2902c05c94fd94caf15a37dafa6dc5ec16b3780091dea72ed6c2ff41d05139244ff1191f5630d3ffbab2718e04be67f784643386ca456f450
 DIST timers-4.3.3.tar.gz 12928 BLAKE2B af64b44116565a8cb6b68349de6a46e8b67d22508e16e204af104ed7a59cc1db1dae0c36917ccde1932c33e53d9d71fc57cb317570cc24aaee82531ce178f37c SHA512 4a715e4a786f98ec429a250de53cfa67bed6b5a99b6298c21251e6dcf1315f1185d8c45bea01025832046381ebac462cd35415f7573d58c55c30b47c2567d4bf
-EBUILD timers-4.3.0.ebuild 919 BLAKE2B 42cfe85814a5cf7c41fe7dea4364c0cdf0ee50ced3a6f971468b6658a4a56a6dd02411aa2deee9f9f5956ac03695cdfdc77c89d65a16274fbf21df1ddfad74c7 SHA512 84a69c49e403633e94c70711c87377189379c94e62da1fb7a700ca743913f3fd9292b5bdfed8b016b880514b8d5479ef79eeebd37592fd785da665eccf725da2
-EBUILD timers-4.3.2.ebuild 994 BLAKE2B 9d61e89a9a9122d377e21a94b384333597a396e5d30d35c63da2c9ab129c3000b02f874d9d589cf68d31c140a354ad07ac39f64393c33407fa0f658f573d49ac SHA512 53311694a85c03106eab363c9729e0729bf084531f9bb6e878a70e1277ea5d7e9cee110f052b3414ef7ce98ffef9b443363c9d10e99fd80e459980758085df07
 EBUILD timers-4.3.3.ebuild 994 BLAKE2B 9d61e89a9a9122d377e21a94b384333597a396e5d30d35c63da2c9ab129c3000b02f874d9d589cf68d31c140a354ad07ac39f64393c33407fa0f658f573d49ac SHA512 53311694a85c03106eab363c9729e0729bf084531f9bb6e878a70e1277ea5d7e9cee110f052b3414ef7ce98ffef9b443363c9d10e99fd80e459980758085df07
 MISC metadata.xml 341 BLAKE2B dfe2c9228e7b666d6b7acb9d9f0cdaa70263a6d5960ecbb144699e62c94ded1b613a8d22f82e5125f6a2e954901a65da57bd432823d922d17164e273b809d8a9 SHA512 b863e101e06e7a8827cd6166688dbfdf77c5bc84203294d0ab63315fe5b5b03fe1898d02b9f219bbbb3f3cddd3d5185c34d9e4079bd993631cc849eae9ac9be1
diff --git a/dev-ruby/timers/timers-4.3.0.ebuild b/dev-ruby/timers/timers-4.3.0.ebuild
deleted file mode 100644
index 7d21bb818d26..000000000000
--- a/dev-ruby/timers/timers-4.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby one-shot and periodic timers"
-HOMEPAGE="https://github.com/tarcieri/timers"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/coveralls/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/Coveralls/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid performance specs to avoid ruby-prof dependency and
-	# because we cannot provide a good environment for performance testing.
-	rm -f spec/timers/performance_spec.rb || die
-}
diff --git a/dev-ruby/timers/timers-4.3.2.ebuild b/dev-ruby/timers/timers-4.3.2.ebuild
deleted file mode 100644
index fe52c2bb6f01..000000000000
--- a/dev-ruby/timers/timers-4.3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="timers.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby one-shot and periodic timers"
-HOMEPAGE="https://github.com/tarcieri/timers"
-SRC_URI="https://github.com/tarcieri/timers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/covered/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid performance specs to avoid ruby-prof dependency and
-	# because we cannot provide a good environment for performance testing.
-	rm -f spec/timers/performance_spec.rb || die
-}
diff --git a/dev-ruby/travis/Manifest b/dev-ruby/travis/Manifest
index 9624d82e741e..75e5cf98bb16 100644
--- a/dev-ruby/travis/Manifest
+++ b/dev-ruby/travis/Manifest
@@ -1,5 +1,3 @@
 DIST travis-1.10.0.gem 197632 BLAKE2B 0639f797789d1676f71b6354ed77e3e403865cca37e5e04c62e4cfd40d44e26e8e93ea0dbf39843811cccb7960e43b186d61d64f681d2eafe95de890d9fd66a7 SHA512 025e8cdf48100ff20d85925a6285993bda0d1651e145d554c2ec987c4557e2d3bc49da6529af4c577fcd9b88600549b3c12cff49b824d7fcb93a96a0c572603c
-DIST travis-1.9.1.gem 198144 BLAKE2B f207b99bd2bc044ddfedf15a4ce5d35fffa77d8a07504f0122fc1463a441bfa33de40b9dad67490bc44a69aa2ce6e7307bda4df11491015b4c5c81d9fb2daa67 SHA512 1489a1378fcbfcd70ce48f1f7b00bbc457503eabf192bd76feaf9896c63ef6ea77c67c077c8c940b11f6c11cf9b28b752db309b060727e1dc36b1ef1b5b4b514
 EBUILD travis-1.10.0.ebuild 1334 BLAKE2B fc7bfc16ef2cfd2e2486587551e61ec65d1e5c0ef805b2846dee12d7d10ec65765f9532a14de404c283a319fbb11768621dc23222edd5b4bf5e8ff1dde04528d SHA512 3ab822483380f383acfc9f6a6330b6be2db3b3edbee908046cfacb292065c882eb89c4518804a5a8f9ff6288e5caf8ca37b54a7da442ae3bfe2447393372b14b
-EBUILD travis-1.9.1.ebuild 1283 BLAKE2B cfb5fa91831515f6fcb9322bff6130db7b35bcc2421c917b792065537262ea0dd4850cd30f085267b86a72d8542272519f3c4a084eabb4abeddd4650e18f7b6e SHA512 236a0982a493c8fde6f9bf6ecbbddf3cc69534d75ae2c62f83a1ae51fe6cb1d7438ff7acb9774ece62b320e46b17bea17d5421f15cd79026ad74abdfddfd6a73
 MISC metadata.xml 335 BLAKE2B 028a3eb98175d899ca2cb4412a35af5c9d9e1dbe43a1065346c7a529087790e3e3482fe7aa489ee4803f7ddff115bb654c62d865957fe80cce7952d316e7bb30 SHA512 2706c228bc0da2e813ab70918226cf82561b8f3f7c186ce5c97a7d74237e2448029bc0ee74b18295996a0c3d09107e7453cfff8257aff91def14ef30468919fa
diff --git a/dev-ruby/travis/travis-1.9.1.ebuild b/dev-ruby/travis/travis-1.9.1.ebuild
deleted file mode 100644
index d2f5e0df229d..000000000000
--- a/dev-ruby/travis/travis-1.9.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Travis CI Client (CLI and Ruby library)"
-HOMEPAGE="https://github.com/travis-ci/travis.rb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-#RESTRICT="test"
-
-DEPEND+="test? ( dev-vcs/git )"
-RDEPEND+="dev-vcs/git"
-
-ruby_add_bdepend "
-	test? ( >dev-ruby/rack-test-0.6 dev-ruby/rspec-its )
-	>dev-ruby/sinatra-1.3
-"
-
-ruby_add_rdepend "
-	dev-ruby/faraday:1
-	dev-ruby/faraday_middleware:1
-	>=dev-ruby/gh-0.17
-	dev-ruby/highline:2
-	>=dev-ruby/json-2.3:2
-	>=dev-ruby/launchy-2.1
-	>dev-ruby/pusher-client-0.4
-	dev-ruby/typhoeus:0
-"
-
-all_ruby_prepare() {
-	if use test ; then
-		git init --quiet . || die
-		git remote add origin "${HOMEPAGE}" || die
-		touch .travis.yml || die
-	fi
-
-	# Remove failing spec where cause is not fully clear.
-	# May be related to highline compatibility issues.
-	rm spec/cli/login_spec.rb || die
-
-	# Remove failing specs where $params keys are reset somewhere.
-	rm -f spec/cli/{cancel,restart}_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbashcomp "assets/travis.sh" "travis"
-}
diff --git a/dev-ruby/treetop/Manifest b/dev-ruby/treetop/Manifest
index 3a476e391169..adc9d2773b85 100644
--- a/dev-ruby/treetop/Manifest
+++ b/dev-ruby/treetop/Manifest
@@ -1,5 +1,3 @@
-DIST treetop-1.6.10.gem 92160 BLAKE2B ff3b6f0a92bcd2ad279c186e3a3eea72aa8243a89d4a1382df6322d73a19b79bede6c9f5c443644a5011b755a673bc9592f964cf61ab68fdd9f2da2dfcc0be94 SHA512 adff1cf93d1ea071be948437e3fd2800c2e892d1dac49d4571a89336773e012007abb1b4e15f0a86031077c46a6667f8fca8e22920e5c29186e0c3227b4d82ee
 DIST treetop-1.6.11.tar.gz 103827 BLAKE2B ccc73373f2e44a95b872ae9f2f32f090363b218eb139d65a4e72c5595d99d5cc3ea7071527f0954aa6b63bc8d5562b0e932ecadec3de962269b3031d1f449b6c SHA512 649310b5c69bb963fc04a597d7aad6bb45deec34c3a46a193ee16203a07aff1d221732b6c7343d68fc772be44522db5f445a45e64bee5ac385ac2eb70abde14a
-EBUILD treetop-1.6.10.ebuild 791 BLAKE2B 7ef5ac54c2a0dc68c4252ee29a09c0f39373ac05c7a1809696693edc410be8474b13e72f8d06724148d090ad2ffdca187ffec950e0b95f0549532c2775ea071e SHA512 384f777d7f63e480d07636ec62d1b844d1a2b174da966be303b54ac29ff5c09e9c135f8996a0d31f55bd5027afb8e6c2901447a4b981bb3fceda223a3f1dd9f5
-EBUILD treetop-1.6.11.ebuild 967 BLAKE2B 35709d362f9ce9205e113f1b7005b030a4541f9d2504cefc43e629668dd8b3d2d82f9fc32c6d030c468749f6420054ad0582d5eeac94e743fb4fb570fc0fc075 SHA512 c62034ea6a71f7039d4456a0f14f234c43a1b380dbdc16ded50b2cf9d3978b4898a2e0152e9afa954354b18ca60ca0e3f26c85e18478881f96ed645b907281ee
+EBUILD treetop-1.6.11.ebuild 974 BLAKE2B be28dc63487a4cb059e5368a8dcc395bdd0e2e22de196a1b5adf50abd0c8d0ab41b905f1518b35916c2e8e7c8190405fce8d6831d6f4686cf403bfc2bb14c096 SHA512 a23906d84f6c7c892717223e7a3e66eba712e1c50c7f07ce6b01e0a339ed0514fb4e06bab1e915d0034752191c5e2cbb53d11ee1f81c8e257172e9d26794b6a9
 MISC metadata.xml 341 BLAKE2B 56ec962d821e9e80edb0a650e3f65f9cdfc8ef0bc866a378cfc285b4bc83b9f705f6cb33e54b53fdb25d0b9e96622c382fb972540fffab4e0a2ac9199212edda SHA512 7bbdf48696d2aa4cdfecc5ab84251ef9225ff2ed0dfa9fb1cd2a827b2da3f74e684642423546b0e9e8f182ff155c0963632e1194de284470854e53dce2a2e45b
diff --git a/dev-ruby/treetop/treetop-1.6.10.ebuild b/dev-ruby/treetop/treetop-1.6.10.ebuild
deleted file mode 100644
index 2b94320d71b8..000000000000
--- a/dev-ruby/treetop/treetop-1.6.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Treetop is a language for describing languages"
-HOMEPAGE="https://github.com/cjheath/treetop"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.0 dev-ruby/activesupport )"
-ruby_add_rdepend ">=dev-ruby/polyglot-0.3.1:0"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/*
-}
diff --git a/dev-ruby/treetop/treetop-1.6.11.ebuild b/dev-ruby/treetop/treetop-1.6.11.ebuild
index ada40f418c14..a497034c749c 100644
--- a/dev-ruby/treetop/treetop-1.6.11.ebuild
+++ b/dev-ruby/treetop/treetop-1.6.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/tty-color/Manifest b/dev-ruby/tty-color/Manifest
index a31f67fc9100..4b215ea16b34 100644
--- a/dev-ruby/tty-color/Manifest
+++ b/dev-ruby/tty-color/Manifest
@@ -1,7 +1,3 @@
-DIST tty-color-0.4.3.gem 11776 BLAKE2B 4e51a41fb97b343c22a6ae832a449905fc215b7e218a31c993a47c66c66c049f70ce0da163d27f593309c6e49c014badc378ea89dec42c94ce6ba9e088798952 SHA512 4447c02f9b738f4fbecc14149d6c09da2da36c489d118f7d18b85f48b9c22b7939e5c62a32048f1a0c958533be15ead3952c72ea03fd1d06b23b1ed29beadcd8
-DIST tty-color-0.5.2.tar.gz 11437 BLAKE2B a123a46f855a3c5b2c56b658ba9dd1987ce2e72684cfd2e673337de1ab802d28ae00fd9c5e761014314999c5590e2466a32c64a1b094dcfc3101a3754458ea10 SHA512 767566786d1d676bd1571f2cc040107ffc9532219bcff594acaac9ccf972d335cbb1838017e23fa3e32264e9e48f57b818690747e617851c43b3f7e37d2648eb
 DIST tty-color-0.6.0.tar.gz 12298 BLAKE2B c6d86666cbc8b46f2e5ef37556457bcffd4a92c65ae6a281ad989ded3d89ded8e3e3f5a1a3f91b009b7acdad9f2697d7100239c13eece4d2222c1fe1e8c2c2d0 SHA512 ab4f550ccf8fdc2cd0ad9368948819e4b77473a087510a4853036f18cfb21bab89e36631372cc5f2ee4f5d44c8c84954d14956d7cb7c3050e58d1ce19d11754f
-EBUILD tty-color-0.4.3.ebuild 484 BLAKE2B ba416a8188443ed245feb6221a9f435069a65b438161e8300d08fc1e89e9b493ecc249589a186cbcaae053c35b4163aec73f827c01715bd03d49478c64eb8c3b SHA512 969675656462ec45b6dd49c488105bb7cf49e1a9b9ba5f1176b77062cffc44d89083637bccbf30cfd81f950ed59d8232512616c44c7a076c3a40f22503c7ec12
-EBUILD tty-color-0.5.2.ebuild 687 BLAKE2B 12658021e4a706497ac52515821e3453758c805b6ce2c6ec85d101a88e58ab48561bbc3764c745d982f3c3a7cebadf00a8a4dcce30aa900c5fd385805b5f9e50 SHA512 659dc635732228bf4b8d9e39ece4bee5c6a16d741589836e88337b291406550237aa53a90b58f84bde3faf82cb07c378d057928d3fce7c9d7038a7eb93aa065d
 EBUILD tty-color-0.6.0.ebuild 694 BLAKE2B 56dd912bb9820cc383d9277b73421c7ec2eead1a0fad62aed08e67afad6da1763a61ccc317880ed60e1e262aa3d5a157aa057644902d1a8fd26003a1594a8d17 SHA512 889f228d62c0030ad3388e95f4f5ab34d9cfcf3cdb84872df961aeba780f1d7c1a643a25d5d90cf1436f3a132bf18b4416af1e78d5911a37012529dcb028bd22
 MISC metadata.xml 337 BLAKE2B 0da0633a903a0e58597b8d73bb5ea564c6dc581191dcfd1311801e8e2c7cf399c6520095ac034a4d93b7938f57abaf098304a444d274432bd0ea1d497bd21003 SHA512 95fb8fed44f8a1ee5d26cd7fe2ab1f7117208a736b45e0d10e3d06f4b1174729ef3733efe2fc455fc398f17605c84c6cd050805578255073b2a1b64b483c082b
diff --git a/dev-ruby/tty-color/tty-color-0.4.3.ebuild b/dev-ruby/tty-color/tty-color-0.4.3.ebuild
deleted file mode 100644
index af90325690f8..000000000000
--- a/dev-ruby/tty-color/tty-color-0.4.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=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal color capabilities detection"
-HOMEPAGE="https://github.com/piotrmurach/tty-color"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-}
diff --git a/dev-ruby/tty-color/tty-color-0.5.2.ebuild b/dev-ruby/tty-color/tty-color-0.5.2.ebuild
deleted file mode 100644
index 26f62942b75c..000000000000
--- a/dev-ruby/tty-color/tty-color-0.5.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="tty-color.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal color capabilities detection"
-HOMEPAGE="https://github.com/piotrmurach/tty-color"
-SRC_URI="https://github.com/piotrmurach/tty-color/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-
-	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/tty-command/Manifest b/dev-ruby/tty-command/Manifest
index b56e635e1571..939e7dee8761 100644
--- a/dev-ruby/tty-command/Manifest
+++ b/dev-ruby/tty-command/Manifest
@@ -1,7 +1,3 @@
-DIST tty-command-0.10.0.tar.gz 31592 BLAKE2B 34bb5a926ad32b236585a3e0d5bcfebc6a7d8b3ab3c63e60db30441f6f66b757260b35b40fe5e22ec96162253716d27111c0def59133e80c9dabbaf5f87f68da SHA512 5397f154603b1516be717ac35665623292d1454c18824cc688227f998c8d14e0744fc143e29dd93e737ae78f1800a1e5812ed6cbacb0df6ac4db28b2f096fcde
 DIST tty-command-0.10.1.tar.gz 32359 BLAKE2B 85dd115d113abda7464f1d6935a730c97c312bcd280c16bbff44f5da294ed9197df2615449656ce8d403b4118c6d363710eb32e49a2ebb3c75896f5feda85bce SHA512 aa707f3af6b72f20ea692469c7dc60bbf146bc59eaedf4a57408a463e7f96b48dc9ec60de31f2298e36b6d56320b238b4364ee0f90d1499784d001e963ea6fa1
-DIST tty-command-0.9.0.tar.gz 30463 BLAKE2B fc0436a80b4b73040a89f085315f50e464efd91d6ee222f7b94eec5b94700089ae22963580febf8296377c859c67f1f21772ecd24d325af76308183df6070e2a SHA512 12c5c238ea34b7236b1c1b3115a7f490ae3986de686359ed390428f766aabdb35de7a1b29363b5be4e09e0fb6888b0c8a30eb466153f64b1d8a77620a657ffac
-EBUILD tty-command-0.10.0.ebuild 717 BLAKE2B 2f73b05720fd1a712cead3132c7c7a23a41e47782fb239d25bf170f560810a11e2c439050f0ee4a85cd69c0a3f8c666b0ea7e470aa202c7ba16bd323160ce17c SHA512 b0c1c88ca136e4c4d408792a3fca7c8b677697eed0af2d4795f6c8180dc54fe7d0a2309d3a21ce2eeb92c5685e998d132211bfffdef2f83d189bb56b5dc8d82c
 EBUILD tty-command-0.10.1.ebuild 717 BLAKE2B 49546179989a39d53aadff5a809fcc49652876dc5267cb4167ae5f6a6d983ccfeca1969e40e19053e4a20f68db69310b5b260e7b1015c8bf3d95a15bd547fbd1 SHA512 fa1aace5caf0643f4ebb6d18b87de33351881d895ab9b85e952f9195f207d0169268ded5407c7d799c268328c98a00881894189a5440e8cbc7ee1488fcfb7d97
-EBUILD tty-command-0.9.0.ebuild 650 BLAKE2B ffcf3580c5547c80cbce0cda9f26aa8c169c712d00a1c6fa283fe19a8b977bc41bea18a800d1cdd701497e9e96d9a7c4299676eea45a1fe8690825ef8cc67e1c SHA512 d6fdd92c8a3ff6b4b291029d3130c0325ffc139e6144086cf829d7e60b39a452f550c63bb14564efab6b4ef1a91b4a3e0effc6e6cbcce9a17000088d8c497933
 MISC metadata.xml 339 BLAKE2B 112fa64cd84b6ac9d81d1411f04775922722a1a5773ebfe28e97fb1b1f11b5b8042843261173490e71512dd0b9c91d3785df2cd876355c19f36ed7e61bea0cee SHA512 40a42bd979378639f3e6e5aba8eb988806b1329ea0da1c223eadf775051b59fd8922c98c46bc1ed40e518618ce03ad4f13415c8743dfcf50c8c994795fbec1d0
diff --git a/dev-ruby/tty-command/tty-command-0.10.0.ebuild b/dev-ruby/tty-command/tty-command-0.10.0.ebuild
deleted file mode 100644
index 861340515246..000000000000
--- a/dev-ruby/tty-command/tty-command-0.10.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="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal color capabilities detection"
-HOMEPAGE="https://github.com/piotrmurach/tty-command"
-SRC_URI="https://github.com/piotrmurach/tty-command/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/pastel-0.8:0"
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/tty-command/tty-command-0.9.0.ebuild b/dev-ruby/tty-command/tty-command-0.9.0.ebuild
deleted file mode 100644
index d5da980e9186..000000000000
--- a/dev-ruby/tty-command/tty-command-0.9.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Terminal color capabilities detection"
-HOMEPAGE="https://github.com/piotrmurach/tty-command"
-SRC_URI="https://github.com/piotrmurach/tty-command/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/pastel-0.7*"
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-}
diff --git a/dev-ruby/tty-file/Manifest b/dev-ruby/tty-file/Manifest
index 38da2c9c7449..b52e7cbb5747 100644
--- a/dev-ruby/tty-file/Manifest
+++ b/dev-ruby/tty-file/Manifest
@@ -1,5 +1,3 @@
 DIST tty-file-0.10.0.tar.gz 31033 BLAKE2B 6d91034fb9ff83f758b260b947a9556a4c45071953025856e65a1d3bf12baab1f583f4d1b01f75aeb8329a4d21c4bcb761cc584ea2944beeda423e8452d0b07e SHA512 5bf3b08b16dc4d7ad918809c8d7860e925fd9ed02fd00f02852674c55a8cd0584d28f39a5b4f28f564aeb38eb0fbe62f89d82fb2a4a7262c874ccec843252946
-DIST tty-file-0.7.0.tar.gz 26418 BLAKE2B d1fa189a5dc25a64f14e6a14e4c8e92504db262d2acd4f47ee96c1becc59a8ef7cbe18457a492583f9a5a7568dbbfe299b5b90b0ba607df09da3601ec23f8e2a SHA512 178b5da7ef4f265bc2a8203d68219e97b09746571cd485e738d79b6bf1c58e8ed85c5745dda6e094958a20bb75be6de87c4c16e8aaf807220e9ea36cf7a8aca1
-EBUILD tty-file-0.10.0.ebuild 849 BLAKE2B 53e6541e75b7f7cc45d6fb94b308946ebc38dadb008a9323717736b17bd835c42b926d8e11b9ec0c23f1e962856c07e27ee57ba2ec11661bd57ddcbdbae62594 SHA512 61268156469861f1b8b7564d2cea9df318608fb0ac208150029ef9ca879a7ac4a01ab18d927c1b0e24c715757259bf940cf68929555b18d977243a8e0a80b77b
-EBUILD tty-file-0.7.0.ebuild 821 BLAKE2B fe9282f2252807dce913c5f7f0241cd97548180c57a50e8042d128f91a6e5984b67e150494475cc88b4e52af813b743904b82d8d39885f5c428e54c06e3983bd SHA512 ab5f0fe83df5e2ee7d150464c4edb327b0cf37448b9ac79ebce6008ba8c2f40001481a7ef4d5044b86322e8a6c93ff85bafbc935156dc4cae3c1b33fc2b3ab0e
+EBUILD tty-file-0.10.0.ebuild 856 BLAKE2B b2beda091993ec3a2db41f7d277dca0821f167bc2039a4ec2fcd7087d1de0e0961c167ee045c4e4adfb486908040a6c3374a59ea54b78c239ee4ff78bc9a6386 SHA512 8a5e5992a6d8de81ee6a18a67d665c309e95ddeba4f1e92fff12054ad3c8cb9fd366fe8e8aacf51677a3a022edc41ad3579bfbe1f5d9ac071ad4f06bc1251a24
 MISC metadata.xml 336 BLAKE2B 74e467da979c1b012e1cb855cad291fb55c11e7aa508d5e9ad60f2f165e397b153c01fb12073a3557289fb64777debc6f100b3668452154d86f7449884572145 SHA512 1606edcef89afd54b19e7086977a77a70d1df55e49dd5028e6432287e9b0ffefca0b01d047d2d2c68ecf4d1a5595056ad0a699ff27eb084126d3c3b8bfea57af
diff --git a/dev-ruby/tty-file/tty-file-0.10.0.ebuild b/dev-ruby/tty-file/tty-file-0.10.0.ebuild
index 0d2fcdcb956d..fb4bb577f7f0 100644
--- a/dev-ruby/tty-file/tty-file-0.10.0.ebuild
+++ b/dev-ruby/tty-file/tty-file-0.10.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-file/tty-file-0.7.0.ebuild b/dev-ruby/tty-file/tty-file-0.7.0.ebuild
deleted file mode 100644
index 736397cd1e6b..000000000000
--- a/dev-ruby/tty-file/tty-file-0.7.0.ebuild
+++ /dev/null
@@ -1,41 +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="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="File manipulation utility methods"
-HOMEPAGE="https://github.com/piotrmurach/tty-file"
-SRC_URI="https://github.com/piotrmurach/tty-file/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/diff-lcs-1.3:0
-	=dev-ruby/pastel-0.7*
-	>=dev-ruby/tty-prompt-0.18:0
-"
-
-ruby_add_bdepend "test? ( dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-}
-
-each_ruby_prepare() {
-	mkdir tmp || die
-}
diff --git a/dev-ruby/tty-prompt/Manifest b/dev-ruby/tty-prompt/Manifest
index 7ee37483b429..eb37c2be5a63 100644
--- a/dev-ruby/tty-prompt/Manifest
+++ b/dev-ruby/tty-prompt/Manifest
@@ -1,11 +1,3 @@
-DIST tty-prompt-0.20.0.gem 72704 BLAKE2B c3a24544459bfd70aa1ada029211d8873665794ac0dfa19bd02c86e3104c937aefc50009763ccacc3b3eb7c91b220125279c4388a94cd4dab5bc2cb77bad701e SHA512 d3e018465779d673bb80d15f2706edd762236dbee37bc9bd090138fb5dd918c63c4cda3418054391b9d15032fde399911e50c6fbed9d8063afc5896b31fb3fb1
-DIST tty-prompt-0.21.0.tar.gz 72679 BLAKE2B 1693a2ad49d308975c0f03d9bbf01a192bc6e5c66eb04108a08a7d338c79d20ac80e8b45b0833f57b6a4f5191880160a8df0a9b9751c3af1f3d77b4952c99393 SHA512 e2963951523f9077a6aac20d12b88d261902c1f6ab1ab01bafd9eef94df76e37fd1448d5b5f81a3a8d2335eade4618896a64c77e80e369b3a660bc8d361cb53d
-DIST tty-prompt-0.22.0.tar.gz 551572 BLAKE2B b18e3acba984c6848161deff659112ee2342d4021c0fa8df1aed1f19d4530382b4c2d4e215b42820be9939a8a563333c163217ac59809b3e9b1e4d68068647eb SHA512 2bc87d41c9359da1bb04a53c2f3535e4845e1a55594624235434b4e6d5f870029ae72436487fa6d2a795101d1fc8263d63dd89cc5d3e59b0756b80448c23e514
-DIST tty-prompt-0.23.0.tar.gz 553952 BLAKE2B 32ac89708b89550c0e46e9dd76cc4acbb1a8bdf6a365019e463c30bd60ee0e06a74a7c5b2c4f8f3cbda70f3a37ec86d6b5be788aec5f73411381f6195c13a467 SHA512 c37213f37c33c756e99ac5aa3c6124c25b94d53a72e013ccca31427a4e9bdb05284926cfc89d39b444cbe75946fe64f1ec40ad61e89f9440b946d9d32ce3ca1b
 DIST tty-prompt-0.23.1.tar.gz 554471 BLAKE2B ae39444b80781ee5c85df87f4ec2b2231b4551a23202070c4570d0e4807a3e4465bb026299dd775de9abf2b8cefe3157cb3fc5297cce4d248f6f8e2aca8c572d SHA512 5e2762d2b229f0aadde7fa09e43ccd317dbda057d829c9003fc6b18f9aaacda1416357af733c4e4f308041c8119ef344b3adc1954a6d31abf801cffdb1848a61
-EBUILD tty-prompt-0.20.0.ebuild 604 BLAKE2B 4ad825cdeb6c476bb1bfa23ba4519bce927089ebe9f4a8bf7c97c81b3c35b670095aa7a8fb825140aef527c4a2afc21386ae72e7dd3f8068c1492b13512465bf SHA512 a3289054a294a48d4821e32aa3e6c65d3821655628c649083370be5bc7d3ed0359393e9d32c063a793c5bcdea7bcc98dd97241816c72f5b8aa6e4e74df0db551
-EBUILD tty-prompt-0.21.0.ebuild 783 BLAKE2B 9d318e9fc03df8a32db4cc5965f18de8fdb0763cb1af6fc27c809784d2a0a8af4dadd822d7f324f5946f57abe0e33eaa6886bed37eefba3aef11b38b1869b5b4 SHA512 81b63b91ed97e36ae060318992e1096da5fe5f022a2671614085a0b99818187530b5260b02db80ceff77c6b4b78de7fa0e88f84786d638c227519d28c74945b8
-EBUILD tty-prompt-0.22.0.ebuild 759 BLAKE2B 9dfe0b42d088f5bd3399f3b84243cfa10ac42289f2c71b80f4db117dcd95e3718b0c7fe349d757d4b1d166d8fdecc0fc1f1d4852ff4c3667218d87dd6b89602e SHA512 e6a164a320ce1cd97aa4fd7a0f78a6b33602187ea05563c30f9474928e5dc41c31da1921dc6bd524ae3a1f65267ec665ff13cd4ca778c8859a966320ef3ab32f
-EBUILD tty-prompt-0.23.0.ebuild 759 BLAKE2B 9dfe0b42d088f5bd3399f3b84243cfa10ac42289f2c71b80f4db117dcd95e3718b0c7fe349d757d4b1d166d8fdecc0fc1f1d4852ff4c3667218d87dd6b89602e SHA512 e6a164a320ce1cd97aa4fd7a0f78a6b33602187ea05563c30f9474928e5dc41c31da1921dc6bd524ae3a1f65267ec665ff13cd4ca778c8859a966320ef3ab32f
 EBUILD tty-prompt-0.23.1.ebuild 759 BLAKE2B 42666c98aa7906cd58486dc55f15fcc78ec90e71d59522233f4c6bd2f88f6f47571203b6d8ec6075f43edf696be2c92d3366aeb7a1538c6170fa7707b08ec199 SHA512 58da9f154244a48694ab22729294ba933fb4d8299372326d41d5849458809bfe82ebbc9bb70dcbf67ee8e00b853d7823c6f41d1fb8e7d582ac9a55cfbdacea9d
 MISC metadata.xml 338 BLAKE2B 8d0c948aefd302a8cbb6e42214b6173a4f8c0349875576c0210fa01dfa14f8574638305952feacf56ddfa087d773ee7465e5c9c19977701c5d6e5af65b5b1693 SHA512 bfbf88166ca6a7bbf39b9a0696d750cd2e75412f732a7a4267e604071e3c4bc28af3a5297cdee5b27bbeae18359710c9ec707f390fbba70e219e94e6803a6640
diff --git a/dev-ruby/tty-prompt/tty-prompt-0.20.0.ebuild b/dev-ruby/tty-prompt/tty-prompt-0.20.0.ebuild
deleted file mode 100644
index 60974d95f5d4..000000000000
--- a/dev-ruby/tty-prompt/tty-prompt-0.20.0.ebuild
+++ /dev/null
@@ -1,30 +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="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A beautiful and powerful interactive command line prompt"
-HOMEPAGE="https://github.com/piotrmurach/tty-prompt"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	=dev-ruby/necromancer-0.5*
-	=dev-ruby/pastel-0.7*
-	=dev-ruby/tty-reader-0.7*
-"
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-}
diff --git a/dev-ruby/tty-prompt/tty-prompt-0.21.0.ebuild b/dev-ruby/tty-prompt/tty-prompt-0.21.0.ebuild
deleted file mode 100644
index 5bbc1b0938c8..000000000000
--- a/dev-ruby/tty-prompt/tty-prompt-0.21.0.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_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="tty-prompt.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A beautiful and powerful interactive command line prompt"
-HOMEPAGE="https://github.com/piotrmurach/tty-prompt"
-SRC_URI="https://github.com/piotrmurach/tty-prompt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	=dev-ruby/necromancer-0.5*
-	=dev-ruby/pastel-0.7*
-	=dev-ruby/tty-reader-0.7*
-"
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/tty-prompt/tty-prompt-0.22.0.ebuild b/dev-ruby/tty-prompt/tty-prompt-0.22.0.ebuild
deleted file mode 100644
index 86c2dc4efca8..000000000000
--- a/dev-ruby/tty-prompt/tty-prompt-0.22.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="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="tty-prompt.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A beautiful and powerful interactive command line prompt"
-HOMEPAGE="https://github.com/piotrmurach/tty-prompt"
-SRC_URI="https://github.com/piotrmurach/tty-prompt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/pastel-0.8:0
-	>=dev-ruby/tty-reader-0.8:0
-"
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/tty-prompt/tty-prompt-0.23.0.ebuild b/dev-ruby/tty-prompt/tty-prompt-0.23.0.ebuild
deleted file mode 100644
index 86c2dc4efca8..000000000000
--- a/dev-ruby/tty-prompt/tty-prompt-0.23.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="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="tty-prompt.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A beautiful and powerful interactive command line prompt"
-HOMEPAGE="https://github.com/piotrmurach/tty-prompt"
-SRC_URI="https://github.com/piotrmurach/tty-prompt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/pastel-0.8:0
-	>=dev-ruby/tty-reader-0.8:0
-"
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-	sed -i -e 's:require_relative ":require "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/tty-reader/Manifest b/dev-ruby/tty-reader/Manifest
index ecd6170a15c4..ba4f1070fef7 100644
--- a/dev-ruby/tty-reader/Manifest
+++ b/dev-ruby/tty-reader/Manifest
@@ -1,7 +1,3 @@
-DIST tty-reader-0.7.0.gem 25600 BLAKE2B 41af0db92c337cdebb428a93b924f466d72f67042267abd4b3cc97a319e01757c2f1f302ec0002de5b90fa1ebecca0d6bffcdc621be2e435d549263779ed3712 SHA512 29f41a15ff9d86300d9cb6067028a2bf540d258d8a8ca11892e26d40e423854ce32706a33a5cb75037d99d8d30d42998ecc6876a99f3c30bbddacffe61fbf70e
-DIST tty-reader-0.8.0.tar.gz 459623 BLAKE2B c787eebf03fa6169e710d7f838ee02f558577bbd806988e088a9f950c3cf5ef6d4f9e3569f2a29f4a81bcaa2222e029128dc48e439eae075741b077e42c70246 SHA512 8fbae094bbba287c2a2176e9838d0769ad33d6d464165f8b46484d47902ce4131842f196d3b7c0fa6f9be10bb37e2315b1dba517d46872b6f8e5a4fb3a6790da
 DIST tty-reader-0.9.0.tar.gz 461051 BLAKE2B f2a48a929fc7ec0f6f98e4508ed50638e041939ae2eadf96cb8d04e4a771304e63648d5c3a85581fef3ae4740a570114e8d427637c6b3a05ece400f7963a26cb SHA512 2480f480a6ab0fa0854386ba0c31b5e78ff53a2d65b23825b13e50929337f56f8e38d1277f61509139cb43eddd8a933fadcd9d3c916c9dbaacf4dac1ec38dbaf
-EBUILD tty-reader-0.7.0.ebuild 621 BLAKE2B 26904268f5551e50bdc8eaa95fd1595b7cbf339a766bdb861d38b739a146d4398d1220c7e661c2c34a83d285d5b509a00d7ad447823fee4b3ad65acece56ba8b SHA512 4da0704f6cd24f89dfc470d940cc96fac7de135c24265b5aba0a87237d76cf14c4972f405031b55e7feccbffa184ddce25a0ed26b9f929d84e9354b2fefd5a6c
-EBUILD tty-reader-0.8.0.ebuild 836 BLAKE2B 4b5d75f0fa828ef4a7f74d15b74f56dd183a5d7da57e297e04bd76e80f5b58313289d57bc6c0936141b0d9c3951276e507b2edd94f1690ffd498dab123165bc6 SHA512 91b223490dd6265e52e24915633fa6357e97c6878382fb39e19ef5b99c1585cfcabf3903d7e083036c26b74856e2635eaedaea8bf52d197eeb689730b72b0843
-EBUILD tty-reader-0.9.0.ebuild 834 BLAKE2B 63728766089fcf45118c363c39c976f863dfe942a92856364e1781504f2642b0bdb9a84b6db2630e791fb3ac8db3a88dced7325437b6c06095d3d03cc927cfb6 SHA512 970d335a11b1f67a94d3b51c274479d3ae7d7e5af4584a568bc31c3a9cc8b67b7c44c903fa296fc7e3e045a1e4ebfe6d56ecff3789a162a7bc0359a2952d20d2
+EBUILD tty-reader-0.9.0.ebuild 841 BLAKE2B b584ed08adb309095c93d10489fa3cd8f674500a33c3c9b279ee8cb8d740d71c863ce64ccef1badba6633f04134f1cc2b362b747e1d6922cee15dd0cf4c95c31 SHA512 c9ed810321549eedbe324d65f59bd32b011a60484a227cd51265ab7ffdf14979d30a514dd507241586d4708715554439ee7ca3721be85d001f90f0b5ad263979
 MISC metadata.xml 338 BLAKE2B ec5b393631bf2e718fbae78e864f2e1a196b3612fdd306c9cd2dbb8e799a1022beb460aa144eb936d595658f89261ce62b774a81f09c9a2338f978d71302ab5c SHA512 abaac738d7e0f3576e26844c9b6315ed39dd3532816d2896d0c04464d7d80633b679d4579ad2059f7e3da5157a218fa977448fa0a7cc006d72652f7968f1c083
diff --git a/dev-ruby/tty-reader/tty-reader-0.7.0.ebuild b/dev-ruby/tty-reader/tty-reader-0.7.0.ebuild
deleted file mode 100644
index 157fbe3ad848..000000000000
--- a/dev-ruby/tty-reader/tty-reader-0.7.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="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Methods for processing keyboard input in character, line and multiline modes"
-HOMEPAGE="https://github.com/piotrmurach/tty-reader"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/tty-cursor-0.7:0
-	>=dev-ruby/tty-screen-0.7:0
-	=dev-ruby/wisper-2.0*
-"
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-}
diff --git a/dev-ruby/tty-reader/tty-reader-0.8.0.ebuild b/dev-ruby/tty-reader/tty-reader-0.8.0.ebuild
deleted file mode 100644
index 608ff92905d6..000000000000
--- a/dev-ruby/tty-reader/tty-reader-0.8.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="tty-reader.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Methods for processing keyboard input in character, line and multiline modes"
-HOMEPAGE="https://github.com/piotrmurach/tty-reader"
-SRC_URI="https://github.com/piotrmurach/tty-reader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/tty-cursor-0.7:0
-	>=dev-ruby/tty-screen-0.8:0
-	=dev-ruby/wisper-2.0*
-"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild b/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
index 93626606fa04..a871eaddb9c7 100644
--- a/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
+++ b/dev-ruby/tty-reader/tty-reader-0.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/tty-which/Manifest b/dev-ruby/tty-which/Manifest
index 70e54c2cc0eb..8c49eddf1978 100644
--- a/dev-ruby/tty-which/Manifest
+++ b/dev-ruby/tty-which/Manifest
@@ -1,5 +1,3 @@
-DIST tty-which-0.4.1.gem 11264 BLAKE2B 540249aaeaa5458fef3572413cf673e04765c1ad41971ac3f9bd930a42855459db6c6f8f47c90ee1021993161db6a399ba6edd0384da7db91da999550d3e733b SHA512 e48b284abb3e4177b9f04acec5202a70d3fcaa2d477444c5a9d9920ac00eb192656bc48ca33d72c26845b415a0a90e907dab1dd35608b62bc8e4b1b1b25af51c
 DIST tty-which-0.4.2.tar.gz 9820 BLAKE2B 07ac2aa7a3e42127f456045fbdb92db2ea9834b08e0fccbe81767e01817ec2bf7304fb8a41408b0c4da8ecba3caf8bc236de9cb5637c6f197fe3835d0e9b231e SHA512 573b4ed1bfd4dd66dc3337d076a6559bda57b76c95c75f1aeef8bb6d4e0c81ef72057f5ef0521a10afb2a550b8850e6311aaa56ef2499146221f33403621ee54
-EBUILD tty-which-0.4.1.ebuild 504 BLAKE2B e4c9fc62b162655cdead13e5a499ffd5dd92727890245a10bde55eb951910426da783ca3018bc17546e210f8374e0eb77d80e64fe620a860f6ae785b061c51aa SHA512 157233a369734d3a000228f13b9b3993d2cb70b68b973ce89e099bae68abd7c0f843f28c2a894d14607826c9189962f497822d49b33f61ba1c99bdf461d2955e
-EBUILD tty-which-0.4.2.ebuild 1056 BLAKE2B 73268e248573fd70bb1d9779082e308c0c289803116beca8dcbe07698352f39366f7698da11b0209a67b9f368fda7546eebc6cf747fb05efb158bd95748f1197 SHA512 0555bcdda7c07587635888825ec829041754f55c11e82a2404d3c27f7b57be13dd31e58d9eff1370d5a9b20d9c97667bffa77b2f654c5ba9ea52ca80da9da294
+EBUILD tty-which-0.4.2.ebuild 1063 BLAKE2B eecd3cdc80b1ce80e9113fad77381b0d4df8c3c3e54f92f82e72383a4578e98ee60c3d552c51355a126193774623de5c24cb2caeaba503e9ac6c51b689c48a5a SHA512 3c580330845686950781a25c42ebca1c2ae5e0e5fad7eb3ffa15dbdbe743fb61eee7ea9d899210731b6813f74b1125561aed40a0e32e83b04dd3e1c6b45352d3
 MISC metadata.xml 337 BLAKE2B 8a91aeaf1cd2959f969f49390d9318bf6613ef6154878d396b5056071657ad478334c527832aa0db276d092e3075ea57e54581918a05d278eb9dda32c414f98c SHA512 57de9c2bb03ea22da8686927fbfda138dba784099c225b4c845405c724e4e44f9c8d05c0d59cf1d5503c5c36aa8db5717bd1df65127591fd56c460ff65d4d43d
diff --git a/dev-ruby/tty-which/tty-which-0.4.1.ebuild b/dev-ruby/tty-which/tty-which-0.4.1.ebuild
deleted file mode 100644
index 74bbc5701956..000000000000
--- a/dev-ruby/tty-which/tty-which-0.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Platform independent implementation of Unix which command"
-HOMEPAGE="https://github.com/piotrmurach/tty-which"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	echo '-rspec_helper' > .rspec || die
-}
diff --git a/dev-ruby/tty-which/tty-which-0.4.2.ebuild b/dev-ruby/tty-which/tty-which-0.4.2.ebuild
index bf34ebfeffa4..73775797dcca 100644
--- a/dev-ruby/tty-which/tty-which-0.4.2.ebuild
+++ b/dev-ruby/tty-which/tty-which-0.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/twitter-text/Manifest b/dev-ruby/twitter-text/Manifest
index d796b7f38327..af027d970d1f 100644
--- a/dev-ruby/twitter-text/Manifest
+++ b/dev-ruby/twitter-text/Manifest
@@ -1,5 +1,4 @@
 AUX twitter-text-3.1.0-frozen-string.patch 3372 BLAKE2B 2c6eb1fcb05561a8bed4114f8b86547532f53c4b2981e14387518ccc7daa69ff0ddbdabeb892cb125c97420a74e8c121f5241b500803ba6a8ef27e6c6d297c1f SHA512 153e0eb1d41e43517ea9604aaebcea40ab814c168654c76276a94833d393250ae10a3be54b83ee839660c37645df25f4144a124e4942aa34b5fd8471ef065320
 DIST twitter-text-3.1.0.gem 59392 BLAKE2B 91f906db8d4cc17086b7bc421f1730646756aec9e041166e18d816da4b680282f312743c52e412e6595d7565c2c7faf0dd18fea815f3bbc53afa675a33ac3c66 SHA512 b0d5a876bd9c1d4788378ebd5029bed51db6a0c3a7cd2c97433eab3ec3655d7bc427c3873364a368c0a10216871c7373e762cfd57c4bdd69800adc95869aa03a
 EBUILD twitter-text-3.1.0-r1.ebuild 784 BLAKE2B e0fc371ae59480613b87c22503c8528ec9aa7e419ea18c3f8799f40cb95095d8ce215711dbc9fc0a036ab6374c72f2fb9d95905b0bf85d01de744010dc667989 SHA512 355e14ac0acceec1e330f0a388b8f1c86bb1fd7e3e5765e0130bccff907cb3fdd2109c96303a34b55f48ff10be1ee5736fed06089ead5463efbb8b0ba92d6942
-EBUILD twitter-text-3.1.0.ebuild 717 BLAKE2B a2c2697c6e3425ad1020b702b423b6edae1c2eed07253d06417f456f15d8e72ec599fcc95f31edbfc382e053269e1a0f15ddffdd8a82a6738578950dd8116612 SHA512 a74baba26339ee53568978ce19d35e28fecee4ff924542d9f35f7c9c6fabca22776bb443f23de444fba8ca892704a5a2070c2d026155ad3ca80483334e9a2cf5
 MISC metadata.xml 346 BLAKE2B 3c20459269b0d8df90be33c5884c0e5925e9f2cde075ebac70a03e74e8afc51cb0d652aa4825099a775cd266e50e47ed6b2efc12a1ac253b68fce15a97766101 SHA512 89f26f9a6f6b3ae47bfbfcdb944b44b17f4fc9217c6858d88c3127dbe580f8e00575c6214cbe62f8e5e83e3d662255757c03d4c5608e69229c0417f55ae23bb1
diff --git a/dev-ruby/twitter-text/twitter-text-3.1.0.ebuild b/dev-ruby/twitter-text/twitter-text-3.1.0.ebuild
deleted file mode 100644
index 02a1ce721c61..000000000000
--- a/dev-ruby/twitter-text/twitter-text-3.1.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="config"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Text handling for Twitter"
-HOMEPAGE="https://github.com/twitter/twitter-text"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/idn-ruby
-	=dev-ruby/unf-0.1*
-"
-
-ruby_add_bdepend "test? ( >=dev-ruby/multi_json-1.3
-	>=dev-ruby/nokogiri-1.8.0 )"
-
-all_ruby_prepare() {
-	#sed -i -e 's/2.14.0/2.14/' twitter-text.gemspec || die
-	sed -i -e '/simplecov/,/end/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index 6f85ec29c3f7..b2cc56930cd5 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,7 +1,5 @@
 DIST web-console-3.7.0.tar.gz 53714 BLAKE2B d69a7b467e419e87d43c988026f278aea5ca142e336d120e0a50ef85b36186d2f388d551f19820e01d85fdca5a49c471aed69cb2ae0d6f1828a99350dfe86d55 SHA512 d44e4dc3ef12216829b3f522e3645b0fa9b8ae34fa70b5e52a96e345b8b5fc8dad9af6f9918ea23d276cae03445133b15f780041a8cb61584b182ca6934fd71b
-DIST web-console-4.0.4.tar.gz 54372 BLAKE2B 5b52c7dbeeeb13ae6cb8bff8982a7a696311e3667ef69b17611cf3ec8ab26b19869ec799e10d4140cc41cfb31a22af1f51134da06d05cca12b488c5470f6ae2a SHA512 66dbfb9d13be57b790053d748c88a9266e673cfcc253df67b4dbb00c874a4bd3601a61b633d5e3e470e010cb764c13846a7038247122140bdb78f40f673cd82b
 DIST web-console-4.1.0.tar.gz 54722 BLAKE2B 242e588843e713b77c0689b17906bb0dad8784ad9b5fd255a174364afa83014d3cb022f1fb52a759aaa9f2453a1a944796c1a84edff65de6a5e1adaebccc4071 SHA512 c295dac733094a4ee4ce9dffa0d65001aa179cd17cc5b9a2a0a418e1e1a4ca3d40fab8bc3f8e099d55a0b7b07295e40d40dd1b3335ac98e9b0cd51590b130e10
 EBUILD web-console-3.7.0.ebuild 1074 BLAKE2B fa1096afae3683ea0da7c0b2d61fc8768f434ba81c805266933f6933c9d345137962abd841d3dd2be17746377666891eeefaeb886a8e55daa1ac2e8c2ba73371 SHA512 d9a93f155a46de6c0c4f60913c85ef874e42e69805e7fea050eed92f6e2542e50061a07694482cf609fdd70bcf044ca1ac03ac2bc5f92a190ce2e219b9aaa7e0
-EBUILD web-console-4.0.4.ebuild 1107 BLAKE2B 351ba5c63c81d8c51f1f63f291ca57cba3c3277ff5e554842221dc6c3e0a58dc118b9dc5c61f8904ea8103747b0100d660444c8fe609a6c25e28f39050a5d6f7 SHA512 e565b77b46d42fe531aa1a0a9c4f7d367b3e58979194084ec4dfb57e91a483b7760507ef78f320f78821e0c098984bc0854b0d94ad5fb345322c5336690ca92b
 EBUILD web-console-4.1.0.ebuild 1129 BLAKE2B 34f019c9d74aeb6fc17de1248ff1fe9c551f02b485bfebf4e11ff12e7e8f25cae5dae09fddec771de11693f4f900c1c44b23bd0c43d5015d62a8a3d1751ae0b2 SHA512 89f61695bf38b3e453181373e00b8d41ab301440b0afd6a1b5b0ac46031691de404c45305e697b6126884ad9579f644aea4a982b462554d9a6bb92d00ec031dc
 MISC metadata.xml 343 BLAKE2B 8883d76dc0b31bd49361ba715fc9546328ba5a3fc734e8a2607547cfde3d8b48914231839f0ea3d4a59f005a5074770e1dcdccc6b5d629197c8f7f859453f178 SHA512 9116cd6bba4d0030e6f8cdf055fd66afed68c52d9f5382a8a9cd2cb28f84c3f397a3e793dfef3b5ee0fc9e1a4dcd1c2d6e6b285fd7fbb027e339e2d15a0381ad
diff --git a/dev-ruby/web-console/web-console-4.0.4.ebuild b/dev-ruby/web-console/web-console-4.0.4.ebuild
deleted file mode 100644
index d5cc8c49ccf8..000000000000
--- a/dev-ruby/web-console/web-console-4.0.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_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="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/actionview-6.0:*
-	>=dev-ruby/activemodel-6.0:*
-	>=dev-ruby/bindex-0.4.0
-	>=dev-ruby/railties-6.0:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	>=dev-ruby/rails-6.0
-	dev-ruby/arel
-	dev-ruby/rack
-	dev-ruby/sqlite3
-	dev-ruby/mocha
-	www-servers/puma
-)"
-
-all_ruby_prepare() {
-	# Use an installed rails version rather than live source from github.
-	sed -i -e '/\(rack\|arel\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/\(byebug\|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 7c6fa5ab62b3..75dedd52dd04 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,9 +1,7 @@
 DIST webmock-3.11.3.gem 125952 BLAKE2B 664253079457cdf400be869b9e61092b12872282057540e42e6fb73a5fbaa38666757f7f8bd336e4f5c45ea1ec52f9af4b444ba67ae24db62a75b5c18636ae08 SHA512 80fd2139126e1e9d6907dfe93021d77179ae6c31cc2a63eb3ee47c011c2a48f18bb84ac08322da8def014f2293564f5669eb41037edbe72ffccfefb7ea281739
 DIST webmock-3.13.0.gem 127488 BLAKE2B d92deda505469fc7fc5adbf0f7a90a462b03999c0affb79bf67523667af30f582b44b10f554c93a1c98e224edf1f8a5a700fc17c3624a962a68d8e61df84127f SHA512 de7c3d8e079f409db53b316238ce37a80db8eeb257e00c8b3f162e5b4f98c4a383108e6cb21be8b71db34295fdb2354502e9b7457741a935572d9afcb75b30c3
-DIST webmock-3.7.6.gem 122368 BLAKE2B 9bc40971f1eec96d88217544acc67b7abfe6c0815a0696119e12fc5629b4f51e1164ecc982525d2c02fa50c7b1b09548c4831c1d597f06acde04a83227ba0dc9 SHA512 85455495476b22d94b23e34a92db3f0f8cf1aa5bb52ea6a8eb71f5f0bcbdad1edc13dff778c62806ec27850320e9f4e17f12525bbac552e5e105ee1ecd771efd
 DIST webmock-3.8.3.gem 122880 BLAKE2B 66371028294f3b15172d718e0fa9402ad6ed1bf7beedb0c62621ad31758d25e401af9cd982a6f29cd1161a7e4d7954f6f9df22ab2e0c44c970a0edca3c0f1304 SHA512 6c845c4ed0c82ba4bb1f32d0d87a87eb945c54e159317aa14e2238b497d38282b7e81542e78c0d68d4b8d4a08e46137de84503829b7381e6d945e45474ebb507
 EBUILD webmock-3.11.3.ebuild 2220 BLAKE2B 4fa059c167e4fe9f53faae3c12ca5bda38d2b91b77409ea3606527ecd7ab49e34d10f0ea81f7b59fac23d7e0e5bb9fa42f93b12676c4578809290330093a72c3 SHA512 90cd3d70911853b5759b3d681090d979a3dc5c8a9a377569134c2a9ee58e0b6d1537b3b3766afef320745fbe8fb9f00d98691aa6275a9193de0d783d8a0a4e72
 EBUILD webmock-3.13.0.ebuild 2221 BLAKE2B b5426673d3d7a104adaa980026361e59a43befc5a89ce4c09eff1b6f9415789952b50e625543db2015d7321fca570804911924fee5e00fbc714bd6741f748a4c SHA512 43b599a71cc5b1286031a69e81ed6f3f8c07b8fd22d93c81df9e32b068fde91f525c9305365e7c89a8e0c890e1e60edbde9d5e4d70d507ea6359fb95994533bd
-EBUILD webmock-3.7.6.ebuild 2059 BLAKE2B 21417ac451a0b70df72a05a8848c8ddf7a2f0f939eb498a5d71f91dd3f2bcd065f15d3ea8ed047c64b70c421562b337054a5388d96d497f52a1b684b58417ca9 SHA512 6b94a52934ada134df94b263fd8fdc9a3ea1388c742a11c2eee24e011fce9f99e86436745d56a646a0e3fb925006f7048a889e2cf82b47ebe39b2d505763b897
 EBUILD webmock-3.8.3.ebuild 2066 BLAKE2B 032b384a4dafd98a1925c0a1582b4698f51f3ed15c0480ac3f6e683492571f869896cdddb8f4f536f84f5cb2b6f0cea89bdcdf1602d9bd40044c60c69a8629ca SHA512 b4f4055fc24416151b55fdd9ee07701ee3562ff03c6dc4f49080417a66539db1b66386721ca7601bc2eae0a30a666a3e52167a3f8d093f9c24a255a94d0c7199
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.7.6.ebuild b/dev-ruby/webmock/webmock-3.7.6.ebuild
deleted file mode 100644
index 9b5de91f5c61..000000000000
--- a/dev-ruby/webmock/webmock-3.7.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-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="3"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
-
-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/http:4 dev-ruby/http:3 ) )"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' 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. patron's latest version is not compatible.
-	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
-	rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || 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/will_paginate/Manifest b/dev-ruby/will_paginate/Manifest
index 3b52e8c974e9..1d1e65c2160f 100644
--- a/dev-ruby/will_paginate/Manifest
+++ b/dev-ruby/will_paginate/Manifest
@@ -1,3 +1,3 @@
 DIST will_paginate-3.3.0.gem 37888 BLAKE2B f1d2178086c7b7efc0ef46d8cccd64f3c0ed54427c3d499e88f7ba4fc3d1eef086060b3dd7e365cddf16558721c500652d0cc252e18618a9f5dbc01ff9ba2f04 SHA512 2114683e16642e4d06523ba69d26438a7111687f73d3ab89bfcf7a413ce5ea68cb076c4f887f34efcd9c6d5525260e9367a5b502ccde5658f3e21f7f0dba12ab
-EBUILD will_paginate-3.3.0.ebuild 597 BLAKE2B 4a64b27ee10f05dc4f5c2fae0c453630d8618ec5d489530983e9ba6b4be178e2d8afce00e30a1440ab1b2dc866880ea78351c2da8a53b6c9ff33ea272eedf068 SHA512 509d889b9887fb89d7714fc08f501ca87bf634a2daccabcdb906e197182d5840b351c413c0681b9a8e11762dc925fdd015c83c2592b69aaa31b6467230b52395
+EBUILD will_paginate-3.3.0.ebuild 598 BLAKE2B dd6165c6868ee2b4ca88e8ef707df5a61389d2136f71b097d0706ecdb7796560afa42d24ad75529d805f03d7db2cd416550df41242a9672e3b9aec192f3aee6a SHA512 a9847d62c4c6b83fbdfbbcc32d9390ad66b09256947ee5b739e86b5e81e087b363ddf6df551f149ccf793cdaf84cadfbbc6adbae4c3887a5b15898ac6d63a15e
 MISC metadata.xml 346 BLAKE2B 859514393fc9d9ac988a812dbb5fc126a269616351c6d8fc32c6ec0f25d685c835f4c1d27ce818807bb330fdc50839b81e6f63d0eb4d77d8f6a95f2da3d849af SHA512 2e061bf277b39327fb84988df2dd9cf548c87dc0bdc51e63b47aeb816c099a4a7fa5b95fc1f3ba35e15c7499d897770397c6f6f2f4d3c1b03733f16f1d0556d3
diff --git a/dev-ruby/will_paginate/will_paginate-3.3.0.ebuild b/dev-ruby/will_paginate/will_paginate-3.3.0.ebuild
index 2195f9149eb2..cc8736e460c0 100644
--- a/dev-ruby/will_paginate/will_paginate-3.3.0.ebuild
+++ b/dev-ruby/will_paginate/will_paginate-3.3.0.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index 43ecdc8f855a..b0910eae9ccf 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,3 +1,4 @@
 DIST yajl-ruby-1.4.1.gem 557056 BLAKE2B ade1c18bff1d95a733a1981f7898f1ebaecaed6e9a0354af2a6b4d0190a37e613830f77d5e57178b622c32e2d8688aaa11a7edd543c17a30a16f9045d21ea4aa SHA512 24cd82380658d784bbf0a7a16d4048125cc5a856b0e0b4d3bdec29a550a9131d3959f9a75eba0d18d5db8d0a23158fb7ef6ea6f60d221a7bc3d8efc437d52df5
+EBUILD yajl-ruby-1.4.1-r1.ebuild 1091 BLAKE2B bf9356176fd7b1b691ac81e05a84c86eec23a38836db8a50ef83f6489876dc13bf6bcb3d9d4dcca8882c83235126c4e6fc51de5fda3dfedeaa1c27a1270270be SHA512 9cf6d5093c9ed4954a4c3305bdf69097c1698c857be893dc44f422c0224ec5721fa44475a0c93bdb370840ae460e4da56ef2e8362b6ee67afabfea66f5f70086
 EBUILD yajl-ruby-1.4.1.ebuild 1224 BLAKE2B b2d0ea92e78e2064a35088b69dabce151e92afbacda771b888820df8c7a6477760c63c9bff3b41f9bf76c5a51d64c70c1d0f9e1cbb608c1864583d36150798de SHA512 9e5bc66bf68533037c0371775d22a70e9d4f5618d2cd02f2052d03d00d1be9e52573781375e72c420eb01726745a65e44d6b03bb6203a3f0d05599032ea45ea8
 MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.1-r1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..9c0004d6cd6d
--- /dev/null
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/yajl/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/yajl"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby C bindings to the Yajl JSON stream-based parser library"
+HOMEPAGE="https://github.com/brianmario/yajl-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${RDEPEND} dev-libs/yajl"
+DEPEND="${DEPEND} dev-libs/yajl"
+
+each_ruby_prepare() {
+	# Make sure the right ruby interpreter is used
+	sed -e '/capture/ s:ruby:'${RUBY}':' -i spec/parsing/large_number_spec.rb || die
+}
+
+each_ruby_test() {
+	# Set RUBYLIB to pass search path on to additional interpreters that
+	# are started.
+	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec || die
+}
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index 0bd7098cfbf8..1caf74c25c7d 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -1,7 +1,5 @@
 DIST yard-0.9.20-git.tgz 921130 BLAKE2B 37b1b2524147a1a8cb36c3835cce4e7666e2c8d3d5c187eb402000fb251df64111c4f104957ac9d28bd0e8d9328eb1d97571337ae54479626dcaab3cf07625a6 SHA512 b7e035a3598c8ef32fcbaae57254c0fb0cba875606b434571da2ef754f3171b5c42a4b3a45bd4bf41bce368f6fb7e448567f601a9cab5fbdae695bbec1b73608
-DIST yard-0.9.25-git.tgz 930253 BLAKE2B 35531a7e90ab99bad8d236ea4774a8aebc50eff5d78f60e2dfea8edb2af965dc60e8c02f8a1f95166e80d6f1ce21aca051b92b2511b88a7d87d2cc90e58bcd17 SHA512 855bf05ce45a965d534191b036831ec1cedc848e21196ed93cc7984d744328d9d5ba39664b4539a707a1556984990360cd27e085b830501ac8d72c6cebb3e689
 DIST yard-0.9.26-git.tgz 930901 BLAKE2B 19baaefc54269bbc7eee053b42f2be85644a062cbf55b0fafb63748876aad3a3143767855f4ee7b10a1ae814110a6cf63c01e4055e054aeb31bf8512e793d80d SHA512 0f70a089d5e5ba33e326b0ae0cc84a2cacfc5a3f3080545d5fc5bb324dedbbbf65116cc9412b3496c09b2b6c15514e854a741a1fd7e2ae782804d6e4ac28fcd9
 EBUILD yard-0.9.20.ebuild 1766 BLAKE2B c8b561e62e689e9dd828cbbd4674a317ce50dddbfd63a82766eabd315ed4a1c8c7ab80f6a84ef77dd2181c164c9419d62ec491a94dedb7eaa6a4a66bc0a25e8b SHA512 9554cd54d05877dd5e3197127e463c01dd01f578a5d92249d2adaf27bba34a8627075a7ed3af229ab28c473b5144959b519d2006dfc034318d00d2e28e73b37e
-EBUILD yard-0.9.25.ebuild 2058 BLAKE2B 7eb00d3fd28282d032dc9ce57b2fe9e27d0ddafb348a6a0d8e1d42e68187aac69943c4e1a4a8892e7a47cff0ac7a10bf3d71ad71d1cbb8ccfa0a009f4d44c6a9 SHA512 a8f2500b60dcbca8af237e84c29f230cbaeaf59a60d47b0a342a35a595618cab64c8656db7fe5ec7b9bfc9225b97dd8d8ba6bb23af83383a0111b241766749f4
 EBUILD yard-0.9.26.ebuild 2053 BLAKE2B 5e0ff76cf08b10fdc85b735ebbcf3508c0ee948db891e3869f66d367d9a2cb68e57f4fd7d0126f7599c50c9c1fe6faabe8eeb2e51f836db6798a18b04b6643d9 SHA512 915cdf0d5d80aa400e54d7eab56c985a51a13aa415699560dba9524acf9b4a2dd9d0edb8b2f0af2ca6442a6bd405b4c681e03b2bb28150d27900138323444dbd
 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
deleted file mode 100644
index 1b7e9b1340db..000000000000
--- a/dev-ruby/yard/yard-0.9.25.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount 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
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-08 15:03:58 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-08 15:03:58 +0100
commit	814f4cf860e299a046b649eaee5463427984c09c (patch)
tree	74c45f097899310e599dad6b8df5b63e0f085bc0 /dev-ruby
parent	7f0ccc917c7abe6223784c703d86cd14755691fb (diff)