10 files changed, 102 insertions, 70 deletions
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 9c3c5ba6a767..b89fb886308d 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1 +1,2 @@
 DIST rbs-1.0.0.tar.gz 497065 BLAKE2B 3cd0d583f3048e11c70882c783766ed4bcd5e464562900d4528da2218a7fcc773be8b36eb79a517314cba0db8360d6b9312531fd07b618d70575c7aef54d0efc SHA512 512e8abd883403697fde537844c99a0780e9f8d1dc59ff827c0372274573967981735065b670afed50c13ca87c6abc44bc6cf47caa9cdc6e6c117c6d0907c405
+DIST rbs-1.0.4.tar.gz 512875 BLAKE2B 7d301e2f6c20d13249e031e8728089ac6291a1ab9bfd81513dae1633604bd45b16bef94c7ccc680c8f78e4a954aab29dc5d1025b05b5f8e00e830c09c5192b3f SHA512 d998a1613b7653278460f5cee19f38bbdd13aa46d9deb8e4da8fd710a78c6ede2784580481cad43700f3d2c4c51d0d0b70eac23b156215ad3df2d227d1f6a3b6
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/terminal-table/Manifest b/dev-ruby/terminal-table/Manifest
index 57e4f458ef79..92a431fae55d 100644
--- a/dev-ruby/terminal-table/Manifest
+++ b/dev-ruby/terminal-table/Manifest
@@ -1,2 +1,3 @@
 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
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 80b6d2d43a24..2397da573caa 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,7 +1,5 @@
 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
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 d92eee58c49c..32f7a75bab76 100644
--- a/dev-ruby/unicode-display_width/Manifest
+++ b/dev-ruby/unicode-display_width/Manifest
@@ -1 +1,2 @@
 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
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
+}