gentoo resync : 31.01.2021

26 files changed, 255 insertions, 276 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index fe3701eaeb26..1771ec0a3419 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 45a022be95fb..0e2a09a4ff38 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -3,9 +3,11 @@ DIST capybara-3.33.0.gem 366592 BLAKE2B fb64b301051011aa82194480bb79a33d06345cbe
 DIST capybara-3.34.0.gem 369664 BLAKE2B 4f55388b809e5d808f4cc3a45690eedc86d2bacd30498af8c891757881c527b0142a8b6cf2d46302d400c77e75eee33b4206b8d01fa416211895bfcb6b5175d3 SHA512 ee722be02cc0b23b7b7c92b29c7eb702a035a95e21c10c237eb6922fbc285c43431deca8bc8e445948a767265f4e8b6ef451f46168f26f8ad6dc6e1c88966537
 DIST capybara-3.35.0.gem 371712 BLAKE2B 5c9cc5bdaa1f536d3cba104b041b937830447176b2748ceac7a729130596492fcd8242bf3eea5f062f920db7b4b1cbb12301c30feff0c51496ae128a7e123f00 SHA512 a52e20e1bbd43eb0169caef5254e3ca45082ee142b754e0e7a6d3a5796b6835afe57ca8230ec4dc1ef87305be3993b58092322c8b1de89bc564d6d51836e2245
 DIST capybara-3.35.1.gem 371712 BLAKE2B 1c389896b3d5a4f188829ab43394ca5aab108aa895a0f98468c6491635341116c4d4478bfa9e67e59171698b7f2186c3165c83d08010de76828c3df405fea1ce SHA512 c3f56df9f2a439ab350b91edb5e2e62ea7e14d1ddf9083107ae37640455cc4dba5f164f26d2dc3e8643a0e4fce22fa4cabbc38b7d88571a75f5e690e03ff0e12
+DIST capybara-3.35.3.gem 371712 BLAKE2B e50c892897cf2838cafb77cb7cfcb54e5fc52c3cdaf11489b60168511f3a213d2ad7f94c67ad236e6177b849f99445733aa4de9691755011bd32f524e5c440b3 SHA512 90507b2254fdd7aff375a305c1112b878d5f0a7c909e7d95b62c6728acc340f73d244304efc07c3dcc707825afcd9b23b088e5d889717efe4edc2dab4dd38d2a
 EBUILD capybara-3.32.2.ebuild 1789 BLAKE2B 0144d4405f871d24f715b1ee0e8e6797b37178939ad921f64d83e033256aa8228900ace9df68358e1d1222ff0ae7adcae830e8cd9e8b6d4a5f521224c618ed71 SHA512 502598533960c4d2fb06e8bec9859067246321ea625c1961c7ef115c44664b3f9b533cedb6c630c9c7dd5093cf873e0d16ea80d3d2d704db950e22bd9a980601
 EBUILD capybara-3.33.0.ebuild 1783 BLAKE2B c9be1ebcbae6b2141e9c0f967d92284c736c57046a30eee07705567e16aa065033ee307ad722aafe07bbe8080e9bb56636f16b0596d8b7a03c48dfc4a091bb0e SHA512 83c5ba82043668977392824b28125859ccaf75fef8cd4dcf829cb163c09b3f5e7603def865ba66dcd2a5a88b7016146e819ab6df58316df11269f463bb95c92c
 EBUILD capybara-3.34.0.ebuild 1795 BLAKE2B f58693cdc2d74c42a46497a13691fba12c1bb909ed6ee5d62bab41651acf2c39bcc0ca80f361861cb838299228f849be80efe3407b979c2010893e854df7571a SHA512 fe7d6b9ddbc73e9c2d884c7942584596a7d010183e85747c250170d32dc6e3c4065a40a0cf83e3cca04bb18e994d1347550106f8d1533287bb1ded850db1f9ac
 EBUILD capybara-3.35.0.ebuild 1795 BLAKE2B 597cff05c9947dbdc205f1542be43773db1217868752c08ff8937b75df9b5f4141b4e76fdf6d4437216e330878765fdf3b73d7ab551f69637d31dbfaa36ec326 SHA512 190ce0d107f781e723cfe44e37eaac19b8d01c798e48c2adccd28869534086f018489639de1ac1b3fb2c4e8cc3ab7cfecc4a1dcacd6b84662f10e0ba83ef2157
 EBUILD capybara-3.35.1.ebuild 1795 BLAKE2B 597cff05c9947dbdc205f1542be43773db1217868752c08ff8937b75df9b5f4141b4e76fdf6d4437216e330878765fdf3b73d7ab551f69637d31dbfaa36ec326 SHA512 190ce0d107f781e723cfe44e37eaac19b8d01c798e48c2adccd28869534086f018489639de1ac1b3fb2c4e8cc3ab7cfecc4a1dcacd6b84662f10e0ba83ef2157
+EBUILD capybara-3.35.3.ebuild 1795 BLAKE2B 597cff05c9947dbdc205f1542be43773db1217868752c08ff8937b75df9b5f4141b4e76fdf6d4437216e330878765fdf3b73d7ab551f69637d31dbfaa36ec326 SHA512 190ce0d107f781e723cfe44e37eaac19b8d01c798e48c2adccd28869534086f018489639de1ac1b3fb2c4e8cc3ab7cfecc4a1dcacd6b84662f10e0ba83ef2157
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.35.3.ebuild b/dev-ruby/capybara/capybara-3.35.3.ebuild
new file mode 100644
index 000000000000..101193fb0c58
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.35.3.ebuild
@@ -0,0 +1,60 @@
+# 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.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/launchy-2.4.0
+	>=dev-ruby/selenium-webdriver-3.5:3
+	dev-ruby/sinatra:2
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/regexp_parser-1.5:1
+	>=dev-ruby/xpath-3.2:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	#sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Update spec to catch the right error code. This seems to have
+	# changed recently accross ruby versions.
+	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec
+}
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 12dbb5dad3ff..85dd20ccec24 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -1,7 +1,3 @@
-DIST rack-2.0.9.gem 256512 BLAKE2B 7da7b239e5679a2f6d19626cbaf8b4ec02a7ce7ffd086732925963ac6fe0397f180548c6065abdbe8d55de802583d7dd09de38da0d4d695559456d852d2b3d4c SHA512 5b56d1aa7bcca11c631f8205605e71f9c661ec9ea7694a16f32f6fdb493cf015d184f924fdf342abebacfbb185e367c9e6dd1288ffe9dabaf4e6566b8853a191
-DIST rack-2.1.4.tar.gz 251772 BLAKE2B 9dbd1ac1dade5935a3819b8c23e492b3e637ed2fc99a95ad0592d40501ea4171433ac4bba08a6031cd77521f4ae0f430ea60394c51b7c5f25cd9e82b72067ba8 SHA512 ce36902125171d2c9baffdd85a171237b9262a47115f043ce96486fb60fcd77826ae28d9416c43a3549db657a3da1c7be45f14842e4b343517f23dab82abd81a
 DIST rack-2.2.3.tar.gz 278045 BLAKE2B 2182ab6ee2ca0e40bd131dc96cf15d7e1015570a0702c2419e50da9eae6afedc0f1543a2fdc1fb32022a65788ab486b7add688c8bf201ad46a3d101b6e625a8b SHA512 0daefd1fd7d1c83a5aaf0e8a3c0d734f805f6718c3f2d20673e78242f10fa99c24f8e8d480cb7f0ee299d96a4b691e4a19c967785de946dc863e9b78e0c3ac53
-EBUILD rack-2.0.9.ebuild 1438 BLAKE2B b29c0c5519c06473a257d10735a19eb0bdc93e4bdc35409eac79dae3aba4f2bd39ed7512794a21cb742b4f98bf977cc60c404a5635e9fc0d00d2e7e3a4c46e5a SHA512 1d0ad3e8ffbd0616938ac7e9bd737d2dc0888e92bb0b1c2ff1dc39d60d518beb88ea47acd561e56200118305d4e9e7a143d54654ce33db2ff1d58de1bce28f10
-EBUILD rack-2.1.4.ebuild 1698 BLAKE2B 19566995b14950f7d79dc361a5170ec56df9b7a8900c658de03e5f47e3344355e96733dac9113a90245545f4c7cc3d053db1ee7877acf2750c858ce17eeb6546 SHA512 f7af118477ae7fce8fccb8c25258f6357cc7159e548f1dce89f35041c6a5172eee018f425d480b0d2511859b68973f786d3963fa74e660b2ea8d5bb6cec53be8
 EBUILD rack-2.2.3.ebuild 1490 BLAKE2B d4f44da51d95db72d57f468f9daade4d77878eed8da95d96368aafd624809c7764a745627fedfac731659de03a4c3dbe5a9a4de065a68f23ee546250a8de2cbc SHA512 76e828ae0f393e3b5581613ffcfa049c5dbd796a3c33119ea30e701cd1b60c6a2f7169fa6fdfc80b39efd6220cb70e8230c54e6480751a9c9e651901ae915985
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-2.0.9.ebuild b/dev-ruby/rack/rack-2.0.9.ebuild
deleted file mode 100644
index 61f526b24039..000000000000
--- a/dev-ruby/rack/rack-2.0.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/minitest-global_expectations
-	dev-ruby/concurrent-ruby
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Avoid development dependency
-	sed -i -e '/minitest-sprint/ s:^:#:' rack.gemspec || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rack/rack-2.1.4.ebuild b/dev-ruby/rack/rack-2.1.4.ebuild
deleted file mode 100644
index f3a1f3f67577..000000000000
--- a/dev-ruby/rack/rack-2.1.4.ebuild
+++ /dev/null
@@ -1,57 +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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc SPEC"
-
-RUBY_FAKEGEM_GEMSPEC="rack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A modular Ruby webserver interface"
-HOMEPAGE="https://rack.github.com/"
-SRC_URI="https://github.com/rack/rack/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_rdepend "virtual/ruby-ssl"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/minitest-global_expectations
-	dev-ruby/concurrent-ruby
-)"
-
-# The gem has automagic dependencies over mongrel, ruby-openid,
-# memcache-client, thin, mongrel and camping; not sure if we should
-# make them dependencies at all.
-
-# Block against versions in older slots that also try to install a binary.
-RDEPEND="${RDEPEND} !<dev-ruby/rack-1.6.4-r2:1.6 !!<dev-ruby/rack-2.0.8-r1:2.0"
-
-all_ruby_prepare() {
-	# The build system tries to generate the ChangeLog from git. Create
-	# an empty file to avoid a needless dependency on git.
-	touch ChangeLog || die
-
-	# Avoid development dependency
-	sed -i -e '/minitest-sprint/ s:^:#:' rack.gemspec || die
-
-	# Skip tests failing due to encoding
-	sed -e '/correctly escape script name with spaces/askip "encoding"' \
-		-e '/uri escape path parts/askip "encoding"' \
-		-e '/correctly escape script name/askip "encoding"' \
-		-i test/spec_directory.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 7553beeab064..884b421692d8 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1,3 +1,5 @@
 DIST rbs-1.0.0.tar.gz 497065 BLAKE2B 3cd0d583f3048e11c70882c783766ed4bcd5e464562900d4528da2218a7fcc773be8b36eb79a517314cba0db8360d6b9312531fd07b618d70575c7aef54d0efc SHA512 512e8abd883403697fde537844c99a0780e9f8d1dc59ff827c0372274573967981735065b670afed50c13ca87c6abc44bc6cf47caa9cdc6e6c117c6d0907c405
+DIST rbs-1.0.4.tar.gz 512875 BLAKE2B 7d301e2f6c20d13249e031e8728089ac6291a1ab9bfd81513dae1633604bd45b16bef94c7ccc680c8f78e4a954aab29dc5d1025b05b5f8e00e830c09c5192b3f SHA512 d998a1613b7653278460f5cee19f38bbdd13aa46d9deb8e4da8fd710a78c6ede2784580481cad43700f3d2c4c51d0d0b70eac23b156215ad3df2d227d1f6a3b6
 EBUILD rbs-1.0.0.ebuild 1083 BLAKE2B 9ce2d41a1f2ddbe8c1b4c012c985cd1bf1254ae8048ffb3d7100d928e896c9f4242b2180170223d7b3ac3365a1b32ddfcb04d7338686a98acb84662137664482 SHA512 a0177e009dfebf89c85cb50f3bbaf22a17012947ee53ea9c95d0ee0dc9b021030ccfe638a75724f21cc647beaf2b0a6a4c44454dbff547c8ce1d7f7d60ce1165
+EBUILD rbs-1.0.4.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
 MISC metadata.xml 334 BLAKE2B 06663250439d029482e4050e769ba2e5bdf9813dcb9244e06a260247d0275b9a172f0cf06dff21bc81d4eeb2eee2bcb73a11fbd3b9cede4abc7d4edacc6d0d5c SHA512 2e1b1fb38bdf7b589cfc2b448cdcbf7786179b92d391a7db698a1fa8ffc6b7a3f6f7f52356ba76cd367314bc6596a735a17743f06d3141fb817abb4aa63b1cf4
diff --git a/dev-ruby/rbs/rbs-1.0.4.ebuild b/dev-ruby/rbs/rbs-1.0.4.ebuild
new file mode 100644
index 000000000000..74d2c248f835
--- /dev/null
+++ b/dev-ruby/rbs/rbs-1.0.4.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="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rbst/Manifest b/dev-ruby/rbst/Manifest
index fa8b291774c0..fae5c67d8611 100644
--- a/dev-ruby/rbst/Manifest
+++ b/dev-ruby/rbst/Manifest
@@ -1,3 +1,3 @@
 DIST rbst-0.6.5.tar.gz 15760 BLAKE2B 3bace4401c8c92eba286f242c1e074aa833094c21e4b00bfa2eee982ad8cbb94024dda2210eb1c72ab88293b1a63a62a5bdeafde2615b0430bd0a7cc21ced14c SHA512 2d4a28c70a4925e1ffe0cd2ff10c275f67cae4a918c1064bd73cb8e7e490be251acff09670d78fef1edeb1a7dab8995aa0b4737563a0797ff66c0fee3f89bba2
-EBUILD rbst-0.6.5.ebuild 1132 BLAKE2B d50df289abd1c67e6d06c342bde67d2556ea0787f38171faf25f98feb59cf09f67c1e0497a1444a4d51ed0e9dbaefd53c15a8acb579d83efaf77db6b4ada9120 SHA512 5dd657ce76ac99d54db0c934a87e4ee5a4e3f2787725ba862991dd4a97beeda906d911e0baab684f568a61651352582520efcdf4816d24e416e93238bff48abb
+EBUILD rbst-0.6.5.ebuild 1132 BLAKE2B 14b2ad516618aafcb59c630b66274a80f8bbaef53edbd3dd783c1935541db02dc09022466fc27619ab6db6a53c94deec077d19fa1586a34400ca4a443c71929d SHA512 1ffc64c5ac70f6cec50769fd4ee09d3fd83e8628df4edc36d1bcb2c53ed92235e9dfc52cb1855e5730db2ec414e52cb6df90a18102fb5d3aaef3b83473afc144
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/rbst/rbst-0.6.5.ebuild b/dev-ruby/rbst/rbst-0.6.5.ebuild
index 4dd5c2e9ee65..7390ccd1e168 100644
--- a/dev-ruby/rbst/rbst-0.6.5.ebuild
+++ b/dev-ruby/rbst/rbst-0.6.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_NAME="RbST"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index cf17fd6b0c81..35f7585f7ea8 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,12 +1,14 @@
 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 1509 BLAKE2B e3ccde747f2f4332247f8bb49e0d0acbea5372e1bbc06dba73d51080269d8935c1b9f2f6a74810e9f2ae6277ca67f8b21c149b22f917455136a98e4d904f21ca SHA512 acfc0df5921458ae89d8168902180273f1bf060196ffeb6d4e345ea2e85d3b2b4d865cbd646b4bfaed6898dd52668e2c6ad699a129f99d84852ea3ff76b20a0c
 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 1435 BLAKE2B 6cff4a15f91e0f6b0e52f15a2b55afba66a4b85672e517bb3fa30ff4c282c7204be194b8bb73a879b0fb70088c11659ac60344d3826fcfd54b94bc20ac302595 SHA512 09b34aed37d5bbd8080a51d69e6f6101e529d28cf1ee4079e768779ff31a25bdaf102f6c5db0bba65f6484eb8d4a04f6a4082d791cd8c509f7f557183cc865d2
 EBUILD rspec-mocks-3.8.1.ebuild 1323 BLAKE2B 3c0e52c22d6ebcb1cec7568c4e1acdf5511a027bafcc6108e92f83984ac84e8092344244be5348a0d0382ef73bad67288b00cf4ece92cc2bd3ee44be0ea5a8dd SHA512 b4972655e538067025c8cf6e2bc2066802585e8d6d7e1d2f0f8843ea6ef3c4dc19f1a600e75eda51fb872f32c6d119605e4518cae098df66873194c58ac65b88
 EBUILD rspec-mocks-3.8.2.ebuild 1366 BLAKE2B 0cdc605e786cb06766d8669b464c426b216aeda9b68bbc5a7c998c6169206ba0a07bffba618f690e251e54ea0bf2f5cf844d321f21b7f7f598143a22c5bcf733 SHA512 21422cb8a959b03728f4d609e8c82324806a530f1d53baaea9f0bd23936142930e92535c2e30714e43201f9efb286a87a17a2570f8996352808ba12aa9dad5b1
 EBUILD rspec-mocks-3.9.1.ebuild 1442 BLAKE2B 3fc39f6bb2a8e8c28b0d237545a7f57480bfb8dfb0bc67bf5b6a70fc65814a98ef2d2ccfdc2608b1b0d7e620dd364cebf633c2a2ed1ec202164c7e5a03907e24 SHA512 905181091e236106392dbd8f467f1b29ca76cda02685341a511fdf8e4ec1d19d7268e8a2d4e7aa9d861e6dd88be84414044518729bec64179ad861186b7d61c5
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
new file mode 100644
index 000000000000..adff253329a5
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.10.2.ebuild
@@ -0,0 +1,50 @@
+# 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-support/Manifest b/dev-ruby/rspec-support/Manifest
index 763589a99118..7d88fd28dd43 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,17 +1,13 @@
 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.0-git.tgz 69705 BLAKE2B 96d5cea9c63e6ec2acdbbfc4b7253acc26dbf5202c3bafc4a461123380db7d56958d2bbc787eaf3f1c480801441f6a134e1f29b1d3ce23b1bd3225fe4d8f37a5 SHA512 10e8fa4af59097891219f00e2ced5940e7a5bc67d946fbd348683d2246a4a491e62f7bac6bb757e14d82bb0ba970fe5633609ca4ab2c97c4900719b8004cf4b5
-DIST rspec-support-3.9.1-git.tgz 70196 BLAKE2B 1edf8e64f6121cb5ed9f543c6ee1aac54f53dfa33e25caf278803a3284414e6d0aba69d1d137e0b80b482e798148ec865feb6e3ab0e9e5d86d13c9aa3754fe75 SHA512 d8267117c9e785766860d781d1e6190714f0d3bb378bf19def213d0807cdfa706f90ef54ff24e8e71ea1e14c6bfa175879250525d3baa7282d997bdc2aa13a0d
-DIST rspec-support-3.9.2-git.tgz 70021 BLAKE2B 410464836d322545a05277cda5cd5cca8b9d2dcb4bf4299850e089d7a169d05aa630395a7c6fc42dffa29d7c6739bcfbf734fa8b0bb69d15b03243534c8da67f SHA512 436a3400a354012b06f471a339386667ed4854814b780f9c21d71182b001b3b4ab45ade578b56e4f2dec81325de5d88baa783f7e56b27bb215cfdc58448b10f1
 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 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
 EBUILD rspec-support-3.8.2.ebuild 1562 BLAKE2B f937ddd8e24d2c6207b1c4e96871d64d3c638c609364eb39f652f5036661f860d7c5038998ca6c6d9bea292d93c917aac4af099ab3519ac0d437580ab9a1fe77 SHA512 c53557a26f755767ce56ce3c041370845a282a3440b82e242e06c444ad971b3f7d6b21a4f3e7335f05e7fd44242e7289e4600a10c0c51d495b81f4fc4f48a468
 EBUILD rspec-support-3.8.3.ebuild 1540 BLAKE2B ee0b161150293923d5c1b068cfc6a27d46e99544902b2c8e582f4a7a63b85a94ec146e821a2706ec857e1b853f847ca2abf2e48a7f9b882ad5d428dc2cf97bc2 SHA512 cc2e2141826574d15a10b30604432d99de74ab5f639bf126b7690c35f14e378c1db7297bb055842f970b363980f7a111436dd65db2ece4845ce18f739614bcce
-EBUILD rspec-support-3.9.0.ebuild 1540 BLAKE2B ee0b161150293923d5c1b068cfc6a27d46e99544902b2c8e582f4a7a63b85a94ec146e821a2706ec857e1b853f847ca2abf2e48a7f9b882ad5d428dc2cf97bc2 SHA512 cc2e2141826574d15a10b30604432d99de74ab5f639bf126b7690c35f14e378c1db7297bb055842f970b363980f7a111436dd65db2ece4845ce18f739614bcce
-EBUILD rspec-support-3.9.1.ebuild 1540 BLAKE2B ee0b161150293923d5c1b068cfc6a27d46e99544902b2c8e582f4a7a63b85a94ec146e821a2706ec857e1b853f847ca2abf2e48a7f9b882ad5d428dc2cf97bc2 SHA512 cc2e2141826574d15a10b30604432d99de74ab5f639bf126b7690c35f14e378c1db7297bb055842f970b363980f7a111436dd65db2ece4845ce18f739614bcce
-EBUILD rspec-support-3.9.2.ebuild 1701 BLAKE2B 3c3e4caf9d03642d48f3ad41db681caa7f035e81874ab0839991a7cafc089b8f5881d069b852bfb6e2121ec4d3474d9f728e643f3d414d94afa9e57881e4812a SHA512 1d82297a1fd689805322ecc9ab43876cd7dcae5018ede1b685b5710c6142625a7184e426e41b851604c811eb4c40e441b5ba5d67fda2bf90659804196fb72e05
 EBUILD rspec-support-3.9.4.ebuild 1758 BLAKE2B 315cac626244c7ea99ade12401af0f8f808fea0262c671b1c36ef83e7c130b6bf82531cf09dbb46080b47faf3caeaf35ac24a77f8e36bb94c43cd56ed849f878 SHA512 9cbb32f50462e79f5cb6903683a732214ef2d337a88004143cb016042a5bba5332482c1586077407d29ea07d40f0ba9d4ab102f023ef631c12c5c55d6bf909bb
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
index 592e2b508da5..6b2a13cb99da 100644
--- a/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.10.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -21,7 +21,7 @@ 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 )"
+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
@@ -45,3 +45,7 @@ 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.9.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.0.ebuild
deleted file mode 100644
index e941c51e7378..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.9.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="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-support/rspec-support-3.9.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.1.ebuild
deleted file mode 100644
index e941c51e7378..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.9.1.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/rubyntlm/Manifest b/dev-ruby/rubyntlm/Manifest
index 628dbd9f7df5..8de9e7ab85e1 100644
--- a/dev-ruby/rubyntlm/Manifest
+++ b/dev-ruby/rubyntlm/Manifest
@@ -1,3 +1,5 @@
 DIST rubyntlm-0.6.2.gem 32768 BLAKE2B 2459dc14c5eaa00c8728bafc0e30fbc1ad09a1fe012e4c6e428028f6232045ddd34fda1654e7b8ebcbc9349cbe24f6f6e44dc4af34c86e6b219e86d3a0caff88 SHA512 11c5a4affc47ac9c4207718856549e202946a0d75f40b508d9dbdde4f5792de0737e03342c653a0cb06f8ca91a260859cd386d6349c909c7ea99c31c77fd6bb3
+DIST rubyntlm-0.6.3.gem 32768 BLAKE2B f9e21068e684620e2e54c685132d034a805fefa4eb90261babac9d58e38167412e0257f0d9b018603772dbd6f152eb9478340d7a390174bc908d1ac8640fcff4 SHA512 7e50c1bf63477fead9189a5ade06db65a3fad04d82bccfbffb513517ab97766053c800af9551e027dedc3aee6fb35288c234d98b1a02815299bcbc463e0edd87
 EBUILD rubyntlm-0.6.2.ebuild 565 BLAKE2B a87d5d7872ab57cd4457618c341825963987025b7dec7a2dafe0a44ef6b8c1127c00cb064752ea02e661d06057e172b30923ed03e22d0a57644197bcb2ea724f SHA512 5a85c9dcb74d23870639537de6cbcb214dfa5746fa55fd019b4950ffbdd944dfa578b707bce706f38655b7811197c81144a0c8122a9a19a698580550d8f79836
+EBUILD rubyntlm-0.6.3.ebuild 527 BLAKE2B 27741a0cf2b3a9c483f1933d1096989d7a89ae9d339b89cba985f14b1a261191bea0fbf3da02c5d795e63ff8a9d528fc2828839b4334fc06ed2092718fe3d95f SHA512 fa1b37c231230ff0f24241ff311101d712a1f2c01685bbd786ef2b97afaa0ecc65b39c4954cf6d0c71366c756df0643daa1702096445c305625bea22a5e2a9e4
 MISC metadata.xml 388 BLAKE2B af72c50e0888c7ead9ece64b81cb359606dd50326aeed54070cf3c4d0302d502a9e313222a696ee3e5db789ceae3953699e847b1988dfb95605a4d36e3086895 SHA512 d40f4a26779ef2675c242119cb67ccac72d00ed53d03148af75a983877091ea595f3c2c413c0f3c85701374705d83e2df647ad91131a20a255ec778638a8c678
diff --git a/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild b/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild
new file mode 100644
index 000000000000..2df81e4f0328
--- /dev/null
+++ b/dev-ruby/rubyntlm/rubyntlm-0.6.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby/NTLM provides message creator and parser for the NTLM authentication."
+HOMEPAGE="https://github.com/winrb/rubyntlm"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/terminal-table/Manifest b/dev-ruby/terminal-table/Manifest
index 04c4574754f1..bdd9cf020d1b 100644
--- a/dev-ruby/terminal-table/Manifest
+++ b/dev-ruby/terminal-table/Manifest
@@ -1,5 +1,7 @@
 DIST terminal-table-1.8.0.tar.gz 13407 BLAKE2B cf1653a18d2b6b72757b149295e01aee83d75241075912d145032e3bc73deb3e33fd00bef033f4bc90dcd51e4bd994b6966805ed7f81833392aba17bbdd7e179 SHA512 4ea4a66e8db384e448d57027e6314f9ce7a0e1511bbfa6e246e26c15a8ff3e44b46c8b6ca03dd521ffdd63b58976d400359131bc1869bf2dc04b3057f399e269
 DIST terminal-table-2.0.0.tar.gz 14286 BLAKE2B aa4e132338a8bbdb8e665584fca947a5b92ee9b8126545b1fffd727d26c7158a9b1cf2959aa917bb93a47e01a4d605ca400d8ddb3be2f73da256ab2f96e91cde SHA512 568542f1fc60cfdb37b14f9d52d6fb6c3ccc36b5c0103c95e3d70fd5e1371c124c97cdea5a4d5a2ec63e34550624b38bd11e0af1073a8eefb3c5fd9eef427576
+DIST terminal-table-3.0.0.tar.gz 23237 BLAKE2B caa8e3a4edd3be491cdcb914d3ad409da434c9dd0fbea407ced8db52f32c3490d6ae09864d3aaeb543944ce3f79d150e983baf656ceaf32bf23fceb7b8582dae SHA512 69ed7d76894e95c4456442d2c2b40ef7b5ee2b90fa2760f1e5271f1ceb569161ee34cb77e8bd9885c2543eed6c37df904c79d28cacf6dc7ddabcc1ab369206c0
 EBUILD terminal-table-1.8.0-r2.ebuild 806 BLAKE2B ff2c57cc6196c3926f516cffe98aa18378913b20d21a4d67476ecf34e053a075e6203bb32be9d418298aec69d76b2abb7b3deab5283e0e1a9eb9210a5c890dc1 SHA512 892b3cafd66670498e4195926a601fc9efc814cdb3bcf676fe403331568303661e5a8544a8cfaf5abcfd35fddf29bb419dbcfef5db3aa1475abfdd102d0b8d31
 EBUILD terminal-table-2.0.0.ebuild 806 BLAKE2B 06655fbce9bc9477e1c975ae4026b9bb7e71a766175b7c36a2e3e423922fb7ca548b7ab8307a5966775d15f2aac5acb0995fd3971978fbb82fc13f77645e82b5 SHA512 a6d70d3de81c8253ee2ee43f148932a8f80048fa2f0bf6d709e46c1b82b61cf9aefcd93026cef435c10647c3acf0b80e3e249240856f1cc38414b311d3e561ef
+EBUILD terminal-table-3.0.0.ebuild 815 BLAKE2B 309f144d71cdef46eacb3b2d3c4352ab15f15adbe2f23bd7de42938b8fd1c386fd4bb47e27a1f4cd2d2c3ed57e8751981ed6804a50296c4aa4add6139266780e SHA512 aa93f693705b9753a6d18518e371bdee5801108d7d3d21244c426c85f4562793ee6d33f7aaf8ab76afd1fc961c3f7a63036b8150ef89bf16f6da06c82bd1793e
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/terminal-table/terminal-table-3.0.0.ebuild b/dev-ruby/terminal-table/terminal-table-3.0.0.ebuild
new file mode 100644
index 000000000000..18408386ae7c
--- /dev/null
+++ b/dev-ruby/terminal-table/terminal-table-3.0.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"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md Todo.rdoc"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple, feature rich ascii table generation library"
+HOMEPAGE="https://github.com/tj/terminal-table"
+SRC_URI="https://github.com/tj/terminal-table/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/unicode-display_width-1.1.1:1"
+
+ruby_add_bdepend "test? ( dev-ruby/term-ansicolor )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 9c285e9e66f5..1f3f75d31503 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,17 +1,13 @@
 AUX testrb 177 BLAKE2B 7f0192ddcadda449bc4766d5910c76ef21ff8cadce1372a46db4fc236374eaa3cb57e145b1b7b09896b3a866ddd9fa1f910f40b751a773bac1104d705902bc0f SHA512 9de97bde52a1e5770a8dae8da3adcbde3b1dfa7cabc6d131159c8a688a7ad5b59dbb528ce9eef3346da12264c0d30415addd907bc66c1d7d90b1dbc4c605730b
 AUX testrb-3 183 BLAKE2B 5bd4712b7a73cc480669facf537b5bbeaf16eeae2782e21d5fe88cf92c9945845803d3f1611d465a3fc16f76838b5aba964e9b96eae35d9cef1b0b269bb94e2d SHA512 cff9584c54bb682f03a0253df953ea930053642e249a3c4573e34cc78f4b77ef943ca5a2c7d1869d926b4a8d9e173ebece69169d845724b03c03f00608bdbdfb
 DIST test-unit-3.3.3.gem 133120 BLAKE2B 37fc200b121e84046d1ee483277fc1274dc3bbcdce95ecb5c88a71a77ca9c164faa8364f68d777896bceb3dd1857fc7146ca464f039c0f30ce5baa466f38ede5 SHA512 ddb40e2ec1f15405cc396a9008912fd41ecdf67a0c02bc7ad4bf7725ee68cdaeec6f171f1786469ed55c1154ce094c5f0dd75103c1989a694bff412c9cc86934
-DIST test-unit-3.3.4.gem 133120 BLAKE2B 1f0122ddfd6337a6dcf16c09f294b3632aff6b20491a6d6dd6ebead18570f4db42fcbc656aada7b11a46c0d04c4a1134356db3d101138739973687695221d819 SHA512 f8fb546ab764cc01f374fd387b26c0d49b5a572b4a428be9b7a583c449fcb73d4aa755f6666d16c7a62e24f263f91329e9e9f997646923b38a1e30af1bb3d168
-DIST test-unit-3.3.5.gem 133120 BLAKE2B 8a799d05fc25a11421eb2385b435de5fc53ffdbffb3ee9c3d4761b11f3b40461ef12b4e2a5583d5ae20fc468846b923317a65cbfbded8dc6ddc066764f1cded4 SHA512 eab194e2361b7aa82dbe18d87dd309e81ddb1cb063e289b63a99c4803c0b88d0323a2028afd6585c14e11e458d4cd5ceb67e674bb7d5065d31b91649be2cbd68
-DIST test-unit-3.3.6.gem 133120 BLAKE2B bbe79ee41f1e25b49099eb00c8c72dcdafd1b7cbae723c1b78240da000f433877790549c6b0503f654f28d86c87bb125578a6d87b41e8b0a28caba87dad1477c SHA512 af8a632117410b486920e77a5bf91afb774a548166ca5cdb2bdeac6c995bf2da6206d2b00e6904024e5e9bf0f68edf9872192faa471297e64c5d4bd4c554fae3
 DIST test-unit-3.3.7.gem 121856 BLAKE2B 507c9c538e89156d620b229e0144258def17975d41fa569178bb0c47761d5afdfd6cc8a99e3255e72df7a3eeeb65358faf1ed81571c12242559990762a09f69c SHA512 42419c947433330f06d68a26dc2c5e8309658d75aac44f6e391e02085eae1819937fa3ba86e86231dfca91e8de86252b7bc79dc5ffa1e1fb8b0f0ec9074a0056
 DIST test-unit-3.3.8.gem 121856 BLAKE2B f47ef205c566fc404d7ffb9380502ae18224c395f65e3ab663472ec4874d0e77b0cb13a5ba80525965ff340c3941168773d6ceca6891036a8ec57bfcaa4ffbd8 SHA512 fba6a7ab4c87c07950498a372a21f888d87f1e1b0e5b49deb97aab4e2815fb85b979aa8afc6e8a6c4a9ad648371f1d9de968958350d0ecab10dfdd2bc0a2c112
 DIST test-unit-3.3.9.gem 121856 BLAKE2B f8ac1568aabc7d53c79715c6b141d3f2be0782e35dda36fc6184e7b7bbae419e883b94f163333e4e1a186c07f55cef181a2d86d4531e3968667e8c5fcfe8e36c SHA512 8e2a1516d33811793aacbf0b31b9609b43437ea6800cfe6c97b1c96395a8eea7c42f2788dd86b6decfda184a27e5818646bbe313d39ce3799a0869f62a0c4c32
+DIST test-unit-3.4.0.gem 121856 BLAKE2B ff975888027ba6122146f074926074ad7eb94e7fd442ab3d9f5d4f2eba83695e7f7ff2d17bd4578fa81caed5971170d0d8d287d8c87426dca63bf7ace1c7a850 SHA512 b7fd84165c956975f758b09c13d6d8f3a613e5d72c381cc3ee7522b5c6e1ad2751d8709bf1d45169823260769909ddaad487f51cdf68312b1e29c1d861f8107f
 EBUILD test-unit-3.3.3.ebuild 903 BLAKE2B d9ef0634df035eeeb4c6c7f9d8270c1eb17273ec48df197ca8d19c7199200596c76795cb7cc9981bf7ae95e639be3f13dd7c452a6213eca515ca75f1ca0d1458 SHA512 e62f58e28b139f207004db0013cf135e6eee866c98be949278dea9cf749a5f381f9729318bfb52c6d8bb756153e72d20956a200a91b0265bd172133a6051362e
-EBUILD test-unit-3.3.4.ebuild 881 BLAKE2B f6d0f83df498b880e1a6e6e147a6ca3a75da903f0d4306630970423873ca763e86aa57d8c87f370be67acbc84172232fdff5ad3378b87334b8c08b03f5023df5 SHA512 0437403fc66c65d355bad0f37745fdd406f1c20de347a6c45a037c68e8651ea2ac003b114d4913c60cc37758cb4340245fbdf5da740f5a0f2c76bb9f54adb8f4
-EBUILD test-unit-3.3.5.ebuild 881 BLAKE2B f6d0f83df498b880e1a6e6e147a6ca3a75da903f0d4306630970423873ca763e86aa57d8c87f370be67acbc84172232fdff5ad3378b87334b8c08b03f5023df5 SHA512 0437403fc66c65d355bad0f37745fdd406f1c20de347a6c45a037c68e8651ea2ac003b114d4913c60cc37758cb4340245fbdf5da740f5a0f2c76bb9f54adb8f4
-EBUILD test-unit-3.3.6.ebuild 881 BLAKE2B f6d0f83df498b880e1a6e6e147a6ca3a75da903f0d4306630970423873ca763e86aa57d8c87f370be67acbc84172232fdff5ad3378b87334b8c08b03f5023df5 SHA512 0437403fc66c65d355bad0f37745fdd406f1c20de347a6c45a037c68e8651ea2ac003b114d4913c60cc37758cb4340245fbdf5da740f5a0f2c76bb9f54adb8f4
 EBUILD test-unit-3.3.7.ebuild 874 BLAKE2B 15fee01d1015bae7196d2e0d022520337845b4f4f6fa001ed5bb7cc2ac2c74f5c187447f0ecea8bc139f8a020f9605bbd28cf80f0d6970eae7dbfd982de6df15 SHA512 272febdcb0cf394379e5b7062ea7bc24a51933574a18a47f1c83d9bbcf7c1d9438a5f47a61f3e7c87baa4dc7eb6364e1ec49b0da322b5be348110ff2010eec37
 EBUILD test-unit-3.3.8.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.3.9.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
+EBUILD test-unit-3.4.0.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 MISC metadata.xml 337 BLAKE2B 0a43a0dc135bad049718f93d6347df3e9b610845ab2e59201f998c2523a6a67769a5591b678093eea2b18276972cf2cfe633892ab3b86acf0ecce357a31cd236 SHA512 82719d56184698a8bd8e03c0c71f2071eb2bd7d7394093b908a69c031c73ae5634ce3739e371b9d57723b78e7a154f26f6d48f270adb8ca0d89b88fdf13ce3be
diff --git a/dev-ruby/test-unit/test-unit-3.3.5.ebuild b/dev-ruby/test-unit/test-unit-3.3.5.ebuild
deleted file mode 100644
index dee64c2972ae..000000000000
--- a/dev-ruby/test-unit/test-unit-3.3.5.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="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/test-unit/test-unit-3.3.6.ebuild b/dev-ruby/test-unit/test-unit-3.3.6.ebuild
deleted file mode 100644
index dee64c2972ae..000000000000
--- a/dev-ruby/test-unit/test-unit-3.3.6.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="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/test-unit/test-unit-3.3.4.ebuild b/dev-ruby/test-unit/test-unit-3.4.0.ebuild
index dee64c2972ae..805bffe784ad 100644
--- a/dev-ruby/test-unit/test-unit-3.3.4.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.4.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
 
diff --git a/dev-ruby/unicode-display_width/Manifest b/dev-ruby/unicode-display_width/Manifest
index ad18055d9f17..7fccdc69d8fb 100644
--- a/dev-ruby/unicode-display_width/Manifest
+++ b/dev-ruby/unicode-display_width/Manifest
@@ -1,3 +1,5 @@
 DIST unicode-display_width-1.7.0.tar.gz 10822 BLAKE2B c3db387b9d61ba4ea9d5559824b22e40f173f9e9bcf7fdad3dba1edc36b39ae90276818bd54e74a6731bd2cb8c48b28e440d07f7e3cedbd8dc13441f79a2b56c SHA512 2b6d2b0118f4a2ad69e98fe2fac611ca94adc0dc59ad076083d0243c630a81a01d650965149a25feaf8986c262a5d55294e064361420e2140b53c5ced5fb1c77
+DIST unicode-display_width-2.0.0.tar.gz 11947 BLAKE2B 4d145f2829922ac2c1681b9f058e218ee7120c1eeb6a440726d79ce8abd2f8bf5adf9f4112ff3de4dfa39f150c5c41bf2dd5458ba87585fca5558ef14355347f SHA512 60ffb44f1685fa8c68b0bc13216fbd77c389840e5c7354428df3daa8ef59d640052210b9e92a54f81ae02f2ac132a8e79a90bad04ae5257a8828a7810b53e227
 EBUILD unicode-display_width-1.7.0.ebuild 748 BLAKE2B 60535e3488a0ed08ee79a7f6c32862022712fa1c2170e32738e83e0d4773cd23eff01b690e38156e7d73dda4b16c026fec853265e14617d5153f0934f1e6e8f2 SHA512 8022d2d7326be6659a3be29e74cae5ead19cccb0955ab8c97f4eecf8268e5f604e97e908aca298bd93c669ac2099b7eee2f16ff56a67e4964764783264ff8157
+EBUILD unicode-display_width-2.0.0.ebuild 801 BLAKE2B 419d1bc4153eafd4671bb6c42c2ad166f7f21d246038aed75ea46f3dd7f72a69769734be1049e90a2c3696948cb45175909af5b27d15a0723aa0247bc992fd75 SHA512 9fc770e09a93e0ee07058c046e81ffb5b6ce14d2265ed765ea72d938e2c09baebc1655b0fb241219209dee2a2393701c9a6704516997ee03aa6639ce5a009810
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/unicode-display_width/unicode-display_width-2.0.0.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-2.0.0.ebuild
new file mode 100644
index 000000000000..bb32c9542642
--- /dev/null
+++ b/dev-ruby/unicode-display_width/unicode-display_width-2.0.0.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="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="unicode-display_width.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Adds String#display_width to get the display size using EastAsianWidth.txt"
+HOMEPAGE="https://github.com/janlelis/unicode-display_width"
+SRC_URI="https://github.com/janlelis/unicode-display_width/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid experimental emoji support for now
+	sed -e '/\[emoji\]/,/^  end/ s:^:#:' \
+		-e '/Config object based API/,/^end/ s:^:#:' \
+		-i spec/display_width_spec.rb || die
+}