5 files changed, 35 insertions, 43 deletions
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index aaa5fa9e6204..be08e6052f5c 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -5,3 +5,4 @@ DIST minitest-5.18.1.gem 95232 BLAKE2B 97743455cb893b8ccee7e5d40daa803500c243e59
 DIST minitest-5.19.0.gem 95744 BLAKE2B b234f64e8957ca89c1cb76baea323874a74295c0fcb69b50efd1f720715d5d26e3d5ad5c0c1e350778f935d7d91f72d27f37e0c937172341b65c99843f983a26 SHA512 c9b5b234fe16127cb376c420a9e3ec111871d604bf7082d09b773637f5229c3b375eb224ae97a237cb3f436a24eb9f49d8d6dddf5d8e99a2806c83b543e10056
 DIST minitest-5.20.0.gem 95744 BLAKE2B b91a895b40a2703478300be236cff87888885099889c19358ccadc73c63d016a3e254c4dc52daa984204e801e3e6fffcb621e674d3e0e3c18b4b2b8fd9e4fece SHA512 906dba1226ed301ad0d7aae2fa138670101e87b11ced69e0c362e65d74fee58a5341756fed8be1f2900863e19c11adcae35ed6ebe7372bb93be0c131dae85a3c
 DIST minitest-5.21.2.gem 98304 BLAKE2B 09de6552a95a639b01a3935cf418301e453a9bb4a7edb85d4f2e27b5e8811db722adbc1ed37da1835c545065f8b4169e19e48c1b48a1778ec1c7bf2048628697 SHA512 4cf86dab870f1cb39ef8c9756fa843c6ddc03ff7738c404db37abc7bdb0ff0436e5a64ed15a733d72e7ae0b8412e4b44cbda0ef3d89ba487268f3550d9248e0c
+DIST minitest-5.22.0.gem 98816 BLAKE2B efdb358f2ec75df87545b521faf5205315b06bf1aea88a8911d0455c71f45658f6a76037c9a0c0774e4c18f27be6e5f3b238b645511ffd7ac290e6cdd3f1df7a SHA512 d8ffac4d46c59bc62a421f66d09d8228a73f3a02e8c159a8b231dc2d049fa44ab5077a96f05ae339c69c5162e0b0b42eeb324dc33dd414058782561263714633
diff --git a/dev-ruby/minitest/minitest-5.22.0.ebuild b/dev-ruby/minitest/minitest-5.22.0.ebuild
new file mode 100644
index 000000000000..c6f3489eae50
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.22.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+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/minitest/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc test"
+
+all_ruby_prepare() {
+	# Avoid a test dependency on dev-ruby/hoe, leading to circular dependencies
+	rm -f test/minitest/test_minitest_test_task.rb || die
+}
+
+each_ruby_test() {
+	export -n A
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index a8035ed770a9..6abe4f9d7e76 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,4 +1,4 @@
 DIST zeitwerk-2.6.11.tar.gz 127029 BLAKE2B 7d810c1b6087522757e60ed0d70fe73dc8633474769992a9b9864a4437a44b482e804f8a7d10c1bc54395054539e80e98be926f31025a7abde5016df87636622 SHA512 6fb2fcf158497f7c11b8edc815a4ac4318d9794c9c76af9a6bed969cee3192f552624c9dfcde8147aafbdf6a754e6715523721d91eb219174f9b768ef4688431
 DIST zeitwerk-2.6.12.tar.gz 127162 BLAKE2B 863e9ff44c14843378e49b34c1ce7694d8d5026f823df5abf69c810f01e3affe9a96de5b615b2d04ab5d71f61e24d42df5b72ef4a415f238428efb4914ac695d SHA512 9d153ed6833a799b0cc2fcbeacab9daca4ef94c2b3871ec5a5cc79cb413f845d53901a875d7b4f2d2b13bd18e2aa9f0858642b76ef3550a1b58f90a9f5d54e9e
-DIST zeitwerk-2.6.7.tar.gz 122658 BLAKE2B 7435f8fb117be8186d56262c0aa8832132105d065cfdd470ed293e9530aa282edd824593f28199b908476a47f90507158beb216b803d39fdaa956d32ffa072ea SHA512 666f527771bc10d34b05a8f27996a9a7adf89466c54fd30a174a1e2e6df2500a2a658e08505964644d25ebd11ed13bf3f741724bfc9fd2a189c3e7b3ce24ffc0
+DIST zeitwerk-2.6.13.tar.gz 127927 BLAKE2B 434da46147eb90d171a93a415dc3cca9c326136efd29a9fa46794dfc5bfcb5fc424fa5f64215281c36473d857c81895758129a0f779f13f6dc536839e240d455 SHA512 4ce3406cc77123439f3499d3f60030d043e9fca6ab1921ec95a5be58a0d4f2af22de06c1e0f48ad9a463f194f2f851eb0d815a1d7f35d9f6a6c0cb2ab3bd403d
 DIST zeitwerk-2.6.8.tar.gz 124209 BLAKE2B 7274b0e9cd55d48fa619d1e9da44074268186c119584fdc3ba18656db33884ec2e24a76ace863d18b0ec51601cde5a3cb9ed35889dcfd3f619960ddfcb1465c6 SHA512 b0609f7d38572d95bdf1a065a9051a7c39b15a7910e354981c991862692e2535477b4abd0a3c623a5d37e53622d95566ecf0d0243ca96fef59f0135693731a71
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.11.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.13.ebuild
index bb0f7f8316f4..eb0be93eb354 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.6.11.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
@@ -18,10 +18,10 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
 
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/warning )"
 
 all_ruby_prepare() {
 	rm -f Gemfile.lock || die
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.7.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.7.ebuild
deleted file mode 100644
index 89cdf8139b50..000000000000
--- a/dev-ruby/zeitwerk/zeitwerk-2.6.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Efficient and thread-safe code loader for Ruby"
-HOMEPAGE="https://github.com/fxn/zeitwerk"
-SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	# Dropping proveit should be fine based on https://github.com/fxn/zeitwerk/pull/253
-	# It's more of a quality check for the tests themselves rather than a test
-	sed -i -e '/\(focus\|reporters\|Reporters\|prove_\?it\)/ s:^:#:' Gemfile test/test_helper.rb || die
-
-	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}