9 files changed, 45 insertions, 41 deletions
diff --git a/dev-ruby/csv/Manifest b/dev-ruby/csv/Manifest
index 06280b6b051f..8a4e5e429b8d 100644
--- a/dev-ruby/csv/Manifest
+++ b/dev-ruby/csv/Manifest
@@ -1,3 +1,3 @@
-DIST csv-3.2.2.tar.gz 86665 BLAKE2B fcbd12d0179a4bf0a0da4f45bf271354c4a352827d4b3ef90ecd0d5b74a9428d1f2165f4f96632a4604a49f4f249fb759e92ff252395992ab564f3635dfa8fe6 SHA512 a514861ffe0d137bf0f75de9e22f9446d2fab6230c234c5dd0cbdf890b06da4be659d3ecc5a940a89b0885f788260b3b2c25373496b4702500b41f236624afd4
 DIST csv-3.2.3.tar.gz 88749 BLAKE2B ec927ae8eaaf4f050e34218cd5a6bef2cd912828e065a03b772070e0ad9f18617b55a771a1fe2a4467106cabf2d54efe84313fdecfb758104545b9874056eec9 SHA512 104b27991f43c9d18a7a0f9db38b32bf638b7b73e25376f1a404b76910a348bf8bf7850a9a671658b928bacfbe288176cfa14dce2ae1524c64dfbeb52138a482
 DIST csv-3.2.4.tar.gz 89474 BLAKE2B a4a4b890f4c978ab933d4f7fde05d90d30f44f4f954db39ca00f867a90b2d584e52625127ee33b81dab82445bf9a6a94340e090c35cd5c6ab9e14b22320d5d57 SHA512 b024132fda678347fae4b237dfbf9f261ca3bf46c22c627db4ad8c6f17a690ab97a8ad4ffe693f6ed3c5a71620408f15ccee9d27c36196c7b51ca9abc09029a5
+DIST csv-3.2.5.tar.gz 89665 BLAKE2B d464e1d36568b30328a3b2b14a363e19f3364f9a18afc16caba3cdff86c9d5bb2565706eef4f5dc573eacb918330477892aab6d544136fe8d1eed4ed558a3860 SHA512 2f41b7a51754843dd90213931e0bd2a29e7d1c03046a526d884c5677263fcb07110f507d7b91f2976693588799df1d261ce3d7f50d473206ce218def4a461250
diff --git a/dev-ruby/csv/csv-3.2.2.ebuild b/dev-ruby/csv/csv-3.2.5.ebuild
index 3266979f415b..b0a5c099d961 100644
--- a/dev-ruby/csv/csv-3.2.2.ebuild
+++ b/dev-ruby/csv/csv-3.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
@@ -22,6 +22,8 @@ LICENSE="BSD-2"
 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"
 SLOT="$(ver_cut 1)"
 
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3.4.8 )"
+
 all_ruby_prepare() {
 	sed -i -e 's:require_relative ":require "./:' -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
 	sed -i -e '/bundler/I s:^:#:' Rakefile || die
diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest
index 4cc0072e7cf0..05fdaecf0a53 100644
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@@ -2,3 +2,4 @@ DIST jwt-2.2.3.tar.gz 50675 BLAKE2B 904a2b9be80ece10cc046d35df784ecc4991c3b09a79
 DIST jwt-2.3.0.tar.gz 53312 BLAKE2B 4653a786d0f5da0d7c7e160f5b0c189f0eab78d045d5af441561c953d6d42fc74d6baff95e54dd9bfd47b3245f3b628e25f99e37016631ef282d95564a08cb1d SHA512 a4dfbb119575d9b5f883c2789734180f092adc75e05310de2e523e352f47469243868480e06f9bfabfa2a48e174ea669e69bd73e0fd002c4f66134462ffe2653
 DIST jwt-2.4.0.tar.gz 59280 BLAKE2B e7ff827c0f8d0514feaea43f5915d83b4be4ee538890250a390cf9a5df3f372d5bff3d90b741d0024c9e89ad28e581626a330b1fb400d2616454a1f964d358e4 SHA512 2bb409a8b2ae2e2330744e3efe306bfc1755c70244f2d7d4dd8ed824c7960f42baf6ec3ee80ed74c0590a3a61b92f61edb157db001d4c4f28005bb50c60bf74f
 DIST jwt-2.4.1.tar.gz 59783 BLAKE2B c18d44f0adda0c2111d312450c01c39d3926afc3e13c807283ffc1fe47b7c49284ab48572b47845c30805c2caefebbdf257e18e807af84819a7fff6c86f881c8 SHA512 871ffe9dc659877a77de0c2a51b1f78b45614cf8265bd07820a9b4b08e38160861b4c9f98391138bfaaf64261ce2eb58eba26c40f29c41b02b8fa16cd260997a
+DIST jwt-2.5.0.tar.gz 65165 BLAKE2B 3011bca18101cd6ec4ce066ce541e31d135ca57ecb3c105915e55d1637e4465e5ae87655c4a7dbb91ff8ca299b6b1c77f9c9263b944cb6b90a1679c25a593cc7 SHA512 fab73ee33769db297b8c8c7381070c8fcd1dd8e43aff2d241ee82f0327867eff3c1067536a90928ad65a2870dc2638515617f5d5cc92023ab1dfe3b6696f10d8
diff --git a/dev-ruby/jwt/jwt-2.5.0.ebuild b/dev-ruby/jwt/jwt-2.5.0.ebuild
new file mode 100644
index 000000000000..54badce1eee7
--- /dev/null
+++ b/dev-ruby/jwt/jwt-2.5.0.ebuild
@@ -0,0 +1,33 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="ruby-jwt.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby implementation of JSON Web Token draft 06"
+HOMEPAGE="https://github.com/jwt/ruby-jwt"
+SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RUBY_S="ruby-jwt-${PV}"
+
+ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
+
+all_ruby_prepare() {
+	sed -i -e "/simplecov/ s:^:#:" \
+		-e '/^SimpleCov.start/,/^end/ 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/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index 5017d779b52c..eb7d4bf66648 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,5 +1,4 @@
-DIST msgpack-1.4.5.gem 86016 BLAKE2B 590226923fd0017a8916b78d87a0a87a006caf1758d563f338371493af2c11ba586a13c7fe1f920e4cfda4a2cf8caa43c679b2709c31cf023f472184234c26c4 SHA512 e750c49c481dbd6bc9c25242f81a86d6ed35895275062cf0928c2929e6c8c354917fa2fcd2a23969cebd650911cf2d244d5d0809ce8252b463c66317f930c64f
-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
+DIST msgpack-1.5.6.gem 89600 BLAKE2B 99cb6b29e52f4e526bd7d0d6d23eca808d2ab277bb7cc9dca73b5b0bdd40fd074d094a59074fa69ff8f47e246545cfcf9f878c87b6b2c3893ed1a091e1fc39be SHA512 b07b6a1499747e2b6ce83751440092cd537c86ac4169fcf730bcb50aa030176018ca7a9961deb160951b193341d388efb26620afe3fff456e5567cafd0156209
diff --git a/dev-ruby/msgpack/msgpack-1.5.1.ebuild b/dev-ruby/msgpack/msgpack-1.5.1.ebuild
deleted file mode 100644
index 7a785b90e317..000000000000
--- a/dev-ruby/msgpack/msgpack-1.5.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 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 ~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/msgpack/msgpack-1.4.5.ebuild b/dev-ruby/msgpack/msgpack-1.5.6.ebuild
index 882ba697121d..1554d87c3454 100644
--- a/dev-ruby/msgpack/msgpack-1.4.5.ebuild
+++ b/dev-ruby/msgpack/msgpack-1.5.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
@@ -18,7 +18,7 @@ HOMEPAGE="https://msgpack.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/mustermann/Manifest b/dev-ruby/mustermann/Manifest
index bca963f9833f..b2cb17aca9c2 100644
--- a/dev-ruby/mustermann/Manifest
+++ b/dev-ruby/mustermann/Manifest
@@ -1,3 +1,3 @@
-DIST mustermann-1.1.1.gem 51712 BLAKE2B cce8b5237b8dea0dae42822ec58c02a88b07b6d75a09bff6d8699c41fbc53c900dd3bc157ef66c863ad7d646bd5380cf935f5fa3cc1b322cef39b73d26682dac SHA512 55d5fd9b8309e0b806b2fb0af409fbc71b958b8f91116991439f2c66b1f71f17647a61020b0349a86132e7d3da383121719ea330538abb8f3c8bef5fbff0b747
 DIST mustermann-1.1.2.gem 51712 BLAKE2B 18333b94381f4e250d2af26a5c93f246dd41b310d158937478b190fe60fb7f6261a73b3399ddbfc2bb5cf0fc2ddb457f7919d9e61d132bf8ffa82757ab5f2cea SHA512 5eae07fed9a9df6799909145964bc635beb1be47454bd32219f2e3df8b915e3875db412aae0d67be94ccaf35d8071f553a364363b701076211f7de3b744f1b46
 DIST mustermann-2.0.2.gem 50176 BLAKE2B 82c134d56a11178a085dc3182e61c67e6e83638f637da23124b3b12aa388622a4d073f693bf562109e07b3bfe75f01ce0492b4fd1f050105b61925b59c7a9410 SHA512 ed72ec2e376e160cd315cdd8fb0693993b02d6898167dc6f158049bd8e0a6ad4f98e604108992e5787067ea951be793d2a7e6e47df2d582907868300aaa74e5a
+DIST mustermann-3.0.0.gem 50176 BLAKE2B fc77327de469f0886de782c577ac164b222bbe18074f1ec63c35a08344cfcdf9a2cb44b453c594e2b153db3055ff1e7bcf969240ade04e70be5cb85a73e486a3 SHA512 c33d41281fe2ac80c0af0c5c31dbab2068c73b9da19a4b82b387bbe551019fc115675634d932a8e56b070c3a06a85d830c982a103e6c5193aff8647f599be6e3
diff --git a/dev-ruby/mustermann/mustermann-1.1.1.ebuild b/dev-ruby/mustermann/mustermann-3.0.0.ebuild
index b71baa060801..9c5d19b419c5 100644
--- a/dev-ruby/mustermann/mustermann-1.1.1.ebuild
+++ b/dev-ruby/mustermann/mustermann-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 # There are specs but they depend heavily on unpackaged code.
 RUBY_FAKEGEM_RECIPE_TEST="none"
@@ -17,8 +17,8 @@ DESCRIPTION="A library implementing patterns that behave like regular expression
 HOMEPAGE="https://github.com/sinatra/mustermann"
 
 LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/ruby2_keywords-0.0*"