11 files changed, 135 insertions, 11 deletions
diff --git a/dev-ruby/activeldap/activeldap-6.1.0.ebuild b/dev-ruby/activeldap/activeldap-6.1.0.ebuild
index 02e8ea17f669..2f27e7f46dc3 100644
--- a/dev-ruby/activeldap/activeldap-6.1.0.ebuild
+++ b/dev-ruby/activeldap/activeldap-6.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="TODO doc/text/*"
diff --git a/dev-ruby/aws-eventstream/aws-eventstream-1.2.0.ebuild b/dev-ruby/aws-eventstream/aws-eventstream-1.2.0.ebuild
index 3efd2dc85a24..6ad8ea5e6abd 100644
--- a/dev-ruby/aws-eventstream/aws-eventstream-1.2.0.ebuild
+++ b/dev-ruby/aws-eventstream/aws-eventstream-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 # Not packaged and upstream not tagged.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/aws-sigv4/Manifest b/dev-ruby/aws-sigv4/Manifest
index c8e203af2c66..395c42a5d320 100644
--- a/dev-ruby/aws-sigv4/Manifest
+++ b/dev-ruby/aws-sigv4/Manifest
@@ -1,4 +1,4 @@
 DIST aws-sigv4-1.2.3.gem 16384 BLAKE2B 55da04b54005107075e3e4ef6a16de03e25ee355938bb1846f2c1ab79f1d9c72b0d272acb8b8c58eb7803710f3ad9be7e2d137b0c387d84d4841f7dcb0fb82aa SHA512 5d3aa9256f5e0fec5841ca5c9ca5aeb9a32cb4cf69f30221476d380c22e8f1863d2fbb4c826b89634c65f8080b83debdd84efe6e14e31f0a01bcf18b9fd71750
 DIST aws-sigv4-1.2.4.gem 16384 BLAKE2B 31aee1c3c028b9ccd6b20e967af97394e3800d27cfec2f19a4f12b0a7f0ed2ed931b720beb7d3e3ae737ca33eb7c4271f565053f201a3e233625c5d1faf33fab SHA512 1c03bf59899c7e7f6b01a786e75985c73459f0aacd3f01df70bac562db452e369317f8cb749f30d30629f058845687d9e2f614547f6f3ca1a4378db724170e4f
 DIST aws-sigv4-1.4.0.gem 16896 BLAKE2B 42a619d5037e6974a64ba329d50b83b221177d50abe89f8cc3dd38cb8c91eb7d049fc2e93b1c3c29910778ab5254b7a65936257fb1809ca92535841a3b58b77b SHA512 250dfd5755fa5163c65c122ff33c4e3b700359281a2b7c0640fb25ad8fbd2f01afa6034413345eb395d0219dc7c4cd6f4ab899c21321b76a336fa49a7ff298de
-DIST aws-sigv4-1.5.0.gem 17920 BLAKE2B 5e9ce828e69e6cd0161ef214bab56c3bb0a2c4250622172a6c80ebfa701c6fe7ea1686e29c229fed093470723e06bff7924f3d8924cea0bb05d898cb90fe2e43 SHA512 aaca9142be244212481726fc60c8f38dcb56ffc57373e2232dbb07aa2dc917559419c56bfe17a9da4f0c0e03f88898679f844bf65f3662016f32c4daf4fa9021
+DIST aws-sigv4-1.5.1.gem 17920 BLAKE2B 3ffe44ea9971826ca139dd4e4e09fcf7ccccf0c9b915bfaa80da9a7088acd8cd9dcb34e2be8e21636aabbea0b4fe4b86135484047a097d00656f8033f39d94ae SHA512 a9aeed9a335aef1358166ead1ba2ea12d588fa61ecf45a6e42dfdf311ef6aa36a372a4f236d0fad0ed61dee81e812f2f9a5ab2fda55a5a42f39c11e48a308afd
diff --git a/dev-ruby/aws-sigv4/aws-sigv4-1.5.0.ebuild b/dev-ruby/aws-sigv4/aws-sigv4-1.5.1.ebuild
index 6a85a6fda115..5fa6f1f45ab4 100644
--- a/dev-ruby/aws-sigv4/aws-sigv4-1.5.0.ebuild
+++ b/dev-ruby/aws-sigv4/aws-sigv4-1.5.1.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md"
+RUBY_FAKEGEM_EXTRAINSTALL="VERSION"
 
 inherit ruby-fakegem
 
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.1-r1.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..ac9b5a278191
--- /dev/null
+++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.8.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="gettext_i18n_rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="FastGettext / Rails integration"
+HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rails:6.0 dev-ruby/activerecord:6.0[sqlite] dev-ruby/temple )"
+ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0:*"
+
+all_ruby_prepare() {
+	rm Gemfile Gemfile.lock || die
+
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove specs for slim and hamlet, template engines we don't package.
+	rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
+
+	# Test against Rails 4.2.0
+	sed -e '1igem "rails", "~>6.0.0"' -i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/minitest/minitest-5.14.4.ebuild b/dev-ruby/minitest/minitest-5.14.4.ebuild
index e11aea35842d..f21a8c2b0a58 100644
--- a/dev-ruby/minitest/minitest-5.14.4.ebuild
+++ b/dev-ruby/minitest/minitest-5.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/minitest"
 
 LICENSE="MIT"
 SLOT="5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~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 ~mips ppc ppc64 ~riscv ~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() {
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index 5d7158a8543b..5017d779b52c 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -2,3 +2,4 @@ DIST msgpack-1.4.5.gem 86016 BLAKE2B 590226923fd0017a8916b78d87a0a87a006caf1758d
 DIST msgpack-1.5.1.gem 91136 BLAKE2B b5e75c9788cb02c6b96a8543c90d1e601a188943c971d8acc594031e76b4836d543960a5fb4377f609d0c9ec9411a80653eb4167f07df4cad8f695fb69cbf278 SHA512 8104eae39b3bae29849d05fa34574e0bbc2d29a99665a20f867d4c01b2ce1aa126486bcb7cd7e01733d3ca683f56b93e651e06cf71229f2bc6f6c8e3f4ff39b7
 DIST msgpack-1.5.2.gem 91136 BLAKE2B fbbadcb82f327f991016e96eb89440dcc3522d67be69cb53a24f7df07d7314edd07dc7f248d26327133fbdf0be44f8b08daca7763af396b55ef7578b19659eb0 SHA512 0a28fbde62527c4344e20181f9538f99281c7b24e1f69d7b9386f1f79486d7ec39bbbde82794d1bac9d827cd3710a672ed5ee411dd02cad5ec5f5ebb5d81f89b
 DIST msgpack-1.5.3.gem 90112 BLAKE2B 872f1365b01cdb9bad9486d66f7d7d1b31af758fbd2ad86b5a74e619f487fd7af64fcc2d1ba3d53d8651e248825a707b202ba9d23ff53d4934702a5f6b4f1b0e SHA512 bbb7db6ee60c4e8d7a54bd19e2947343ee1c30ae348d13087901ee2e39c83ddd338a471c424bf1e05b6f10fb15493dc6bda3a71c7e85370a6d3270c8e99f2724
+DIST msgpack-1.5.4.gem 89088 BLAKE2B e95008fbeaf37f1aaff9476054be37c8377e7ea8a508b007391f957bfa96332fcea74db86b5204570e120481be95c4b0a5df97ce2db77f66bb452d299e1cfd3e SHA512 916537138bffa3c6045357cc979e8b90d79fd3940e195e9a6f7386f47fd5f2404e7095410271635f2510ef17b459a66050b3089dd73a88542b2b62634e7af813
diff --git a/dev-ruby/msgpack/msgpack-1.5.4.ebuild b/dev-ruby/msgpack/msgpack-1.5.4.ebuild
new file mode 100644
index 000000000000..1554d87c3454
--- /dev/null
+++ b/dev-ruby/msgpack/msgpack-1.5.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/msgpack/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/msgpack"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
+HOMEPAGE="https://msgpack.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove jruby-specific specs that are run also for other rubies.
+	rm -rf spec/jruby || die
+
+	sed -i -e 's/git ls-files/find * -print/' msgpack.gemspec || die
+}
diff --git a/dev-ruby/oauth/oauth-0.5.10.ebuild b/dev-ruby/oauth/oauth-0.5.10.ebuild
index 6aacd85e42e9..d2a781ddc4e8 100644
--- a/dev-ruby/oauth/oauth-0.5.10.ebuild
+++ b/dev-ruby/oauth/oauth-0.5.10.ebuild
@@ -32,8 +32,14 @@ ruby_add_bdepend "test? (
 
 all_ruby_prepare() {
 	# Require a compatible version of mocha
-	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.1.0" ; gem "actionpack", "~>6.1.0"' \
-		-e '2i gem "test-unit"; require "test/unit"' \
+	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.1.0" ; gem "actionpack", "~>6.1.0"; require "action_dispatch"' \
 		-e '/mocha/ s/mini_test/minitest/' \
 		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
+
+	# Avoid test tripped up by kwargs confusion
+	sed -i -e '/test_authorize/askip "kwargs confusion"' test/units/test_cli.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/**/*test*.rb"].each {|f| require f}' || die
 }
diff --git a/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild b/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..24a93451615c
--- /dev/null
+++ b/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="history.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple Simple HTTP and REST client for Ruby"
+HOMEPAGE="https://github.com/rest-client/rest-client"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/webmock:3 )"
+
+ruby_add_rdepend "
+	>=dev-ruby/http-accept-1.7.0:1
+	>=dev-ruby/http-cookie-1.0.2:0
+	>=dev-ruby/mime-types-1.16:* <dev-ruby/mime-types-4:*
+	>=dev-ruby/netrc-0.8:0
+"
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' \
+		-e '/namespace :windows/,/^end/ s:^:#:' -i Rakefile || die
+
+	# Remove specs that requires network access.
+	rm spec/integration/{httpbin,request}_spec.rb || die
+
+	# Fix specs confused by ruby30 keyword arguments
+	sed -i -e 's/with(/with({/' -e '/with/ s/)$/})/' spec/unit/resource_spec.rb || die
+	sed -i -e '508 s/1 => 2/{1 => 2}/' spec/unit/request_spec.rb || die
+}
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild
index 70968be2d9c7..2a120aace66d 100644
--- a/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.16.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -38,4 +38,11 @@ all_ruby_prepare() {
 	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
 
 	sed -i -e 's/git ls-files/find * -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix kwargs expectations for ruby30
+	sed -e '455 s/:format => @default/{format: @default}/' \
+		-e '460 s/:format=>:xml/{format: :xml}/' \
+		-e '465 s/:format=>:json/{format: :json}/' \
+		-e '477 s/:format => @default/{format: @default}/' \
+		-i spec/provider_spec.rb || die
 }