5 files changed, 37 insertions, 104 deletions
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index f31b1a7cfb42..b148e4d3afe6 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,4 +1,2 @@
 DIST maxitest-3.7.0.tar.gz 62716 BLAKE2B 9919702c3b6c701edf6a5de8c1054547edaeeda518a7b7bae3f419cba9f92f535ec7870ece080fb472d7635243afec4aeed4a27fd839874aa40d63d6ce4ecab8 SHA512 4843f9d405a40177622e9892d1e5fffe297ae03cfef68b73ce3ee966cc3a36e126a9f5a5018b898465f5ad40f8d4fc1e6bf53f5c76b376efeff669b57dd1e8aa
-DIST maxitest-4.3.0.tar.gz 62596 BLAKE2B ddfa98aa4b4e1e0c85100ed6b703e8b76f5a251913e34de03f8cacdc0eb3a60014945786c1f60d81163d8c690f1cf37689fdc05b15a53b63b08247842f736176 SHA512 b81cc37bbd1ed5c149c4d541591fcec46e1e1fc74fc20205cf33745de4fad7fc302e8120b79d17e39412d7133b8d57fee064e1a36380efbde9bdd22f7bbc05b7
-DIST maxitest-4.4.0.tar.gz 62749 BLAKE2B 0545da95ff3bf6c61a330f041b7944f7ef7dfdb00267d28273b8a0bf8914647a0c34e32a826acc89fe2f2d9a1ac2cc610ca968cef273a6a6e7d64db68c6583cf SHA512 37b6a8c9a992fd54c605c0b26a490ddfd8b06e00e9686a41e6170d81c047b6b255ad337f315d8c5d4176e8acba19e2a51061a402bba7dd3d528e14d20e2d24c4
 DIST maxitest-4.4.1.tar.gz 62757 BLAKE2B 0023472200643dcc17aa7fc3720ebdaccb988628eedd55d69c47a0702b4700760dcc9178f1d63a29d8b0a461ceb7195f9d13579cf0393a3ca669515bcf77239a SHA512 927c5619541f13b2af064f1adb01670ec43570252a62d32b98674b7d4dd72ebc02594c000f6dfae7b9de275086df23e418f13c4c21595d47f429b86d0941dbc2
diff --git a/dev-ruby/maxitest/maxitest-4.3.0-r1.ebuild b/dev-ruby/maxitest/maxitest-4.3.0-r1.ebuild
deleted file mode 100644
index 5ae8329accb0..000000000000
--- a/dev-ruby/maxitest/maxitest-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,51 +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"
-
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Minitest + all the features you always wanted"
-HOMEPAGE="https://github.com/grosser/maxitest"
-SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/minitest-5.17:*"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	# Remove developer-only gems from the gemspec and avoid git issues
-	sed -i -e '/wwtd/ s:^:#:' \
-		-e 's/git ls-files/find */' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/\(byebug\|bump\)/ s:^:#:' Gemfile || die
-
-	sed -e '/shows short backtraces/askip "fails on ruby27"' \
-		-e '/fails when not used/askip "fails with newer maxitest by design"' \
-		-e '/shows version/askip "fails due to missing require for version"' \
-		-i spec/maxitest_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the correct target
-	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
-		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
-		spec/maxitest_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" RSPEC_VERSION=3 ruby-ng_rspec spec
-}
diff --git a/dev-ruby/maxitest/maxitest-4.4.0-r1.ebuild b/dev-ruby/maxitest/maxitest-4.4.0-r1.ebuild
deleted file mode 100644
index 5753c6ff3396..000000000000
--- a/dev-ruby/maxitest/maxitest-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,51 +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"
-
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Minitest + all the features you always wanted"
-HOMEPAGE="https://github.com/grosser/maxitest"
-SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/minitest-5.18:*"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	# Remove developer-only gems from the gemspec and avoid git issues
-	sed -i -e '/wwtd/ s:^:#:' \
-		-e 's/git ls-files/find */' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/\(byebug\|bump\)/ s:^:#:' Gemfile || die
-
-	sed -e '/shows short backtraces/askip "fails on ruby27"' \
-		-e '/fails when not used/askip "fails with newer maxitest by design"' \
-		-e '/shows version/askip "fails due to missing require for version"' \
-		-i spec/maxitest_spec.rb || die
-}
-
-each_ruby_prepare() {
-	# Use the correct target
-	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
-		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
-		spec/maxitest_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" RSPEC_VERSION=3 ruby-ng_rspec spec
-}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 3d86c1b0bbc4..80af02b7a9c6 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1 +1,2 @@
 DIST test-unit-3.5.7.tar.gz 164734 BLAKE2B 470a4552f2da0b7b9c8f3cbd071229fefa12c1e48c32936a6520902a9443a891cd19ed0e7c71ba4f8d81747902afd2e3dbc3eaa6ac7683ca11e5ad88e7c4497e SHA512 af678a89590c9305eeac3a4e5c7e99354df5b49157de573ee3ff312dad9f12dbcaef3dfe7ffc256194e39e0438625acdd9ab3e9686d7e2c58b2cf225f7f1f74c
+DIST test-unit-3.5.8.tar.gz 165216 BLAKE2B 1a039931d87ce3ad4afecd4c1105bb6197acc05be3b9091ca6361689f42d725d1333553b7527bc5cb46306acd3ac4df20ed809e0aca9928a760fc0d849a51e2b SHA512 ab7f492dd5f4606cd91a32240aa3ef6dffec48281b65d960bf87d0b2a9a865d6273bb4cc6896397136c5b313669f615fe6f5a83a6a4ab241013eaa51cf5e3341
diff --git a/dev-ruby/test-unit/test-unit-3.5.8.ebuild b/dev-ruby/test-unit/test-unit-3.5.8.ebuild
new file mode 100644
index 000000000000..35292fb09beb
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.5.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
+
+RUBY_FAKEGEM_GEMSPEC="test-unit.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+SRC_URI="https://github.com/test-unit/test-unit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~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"
+
+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
+}