gentoo auto-resync : 29:03:2024 - 13:13:23

28 files changed, 140 insertions, 457 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index d83813f81777..d925b14f6116 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 5d2c25b6420c..e574e9a3e50c 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -8,6 +8,6 @@ EBUILD actioncable-6.1.7.6.ebuild 975 BLAKE2B 19389609d0ebffb35bcb53bf259b3381ed
 EBUILD actioncable-6.1.7.7.ebuild 972 BLAKE2B aa03138561405bd692a1375147855d6a8a6e4a9bac99d2014a576de0d649a64725a03877bd028db3d28d464b9fdf2d2b08514b6316dc6437dc868ce241478f99 SHA512 dc787e4caccababaa12fbe0a2465377d1df7bad0c44730058212a2cb0aa984468b34c5184f551f73ba69ad470b243ffd49d1f969e9c81aff8ef2d14afb43d8aa
 EBUILD actioncable-7.0.8.1.ebuild 984 BLAKE2B 5036f820fbba8f838f2fe5ae51ab8c0417d4c98f11119a52cc3c163d3ee7e381e5dbb5a2c535b3e2dd388094880e3d1a2eb17bcd6d579000ae5ddc5bb93a097e SHA512 0dba7a14758e19c641c99c2a88e307701aa3aa3908c8e202852ab9691c9df5a0cef89cbcbca5f23eda99e62152ef49e458747dcab007fab5d45f18e2b6420faa
 EBUILD actioncable-7.0.8.ebuild 980 BLAKE2B 638db8dc4298da640d0daf572361413ce8050350f4792756a6262ecc83bc91d4068a93916f2857f2acfcd708fffca55a3ac7191156b319c0b347ebb03ca4cec6 SHA512 dcbd50f49b72bdbc926ca364a0adedd46b194b1fcafa52e8f837983b37339eba33024f5252166258cbc2eb0a669e23af0323da581f0d1c282b94fcd198fe9f97
-EBUILD actioncable-7.1.3.2.ebuild 1011 BLAKE2B 4c3b6503b444bd82c2693b30bc25892fe262758afc3799ff6572bab8f4a2679158b22e574aa79704469fa211bd854f653b9b78daa67817fcd9f5fd3e6d92d0f9 SHA512 e94f9a26d7f67a18f7c190df5f2667a1f521f50839b6f136a385baebff688ef0768b5176f20240d01dd6a56b45be83bb607b48a578d4f4d066194e7e3d592f5d
+EBUILD actioncable-7.1.3.2.ebuild 1004 BLAKE2B 1a637621b133e6c84bc946e521dcf24702a4028f678e9ef15123e1b707d10151299778654a22539caf0b79fa9f9e2d8a95049795f8d8f247427667c20be218ac SHA512 f03ea09fa66c4215aeae2fd586eec85bd81136e28f8aea7a120cf344e8cf38c83ba20585288e28cf4064e78d959f05f8ecf51d8d0c6442770b0417343f716747
 EBUILD actioncable-7.1.3.ebuild 1011 BLAKE2B 4c3b6503b444bd82c2693b30bc25892fe262758afc3799ff6572bab8f4a2679158b22e574aa79704469fa211bd854f653b9b78daa67817fcd9f5fd3e6d92d0f9 SHA512 e94f9a26d7f67a18f7c190df5f2667a1f521f50839b6f136a385baebff688ef0768b5176f20240d01dd6a56b45be83bb607b48a578d4f4d066194e7e3d592f5d
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actioncable/actioncable-7.1.3.2.ebuild b/dev-ruby/actioncable/actioncable-7.1.3.2.ebuild
index 4bfbe8bd981a..2a23b3ae5ec6 100644
--- a/dev-ruby/actioncable/actioncable-7.1.3.2.ebuild
+++ b/dev-ruby/actioncable/actioncable-7.1.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
@@ -43,5 +43,5 @@ ruby_add_bdepend "
 	test? (
 		>=dev-ruby/railties-4.2.0
 		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
+		dev-ruby/mocha
 	)"
diff --git a/dev-ruby/async-container/Manifest b/dev-ruby/async-container/Manifest
index 6910bae7b09e..6b01a5687af5 100644
--- a/dev-ruby/async-container/Manifest
+++ b/dev-ruby/async-container/Manifest
@@ -2,8 +2,10 @@ DIST async-container-0.16.12.tar.gz 22626 BLAKE2B 8e850ebededcc0110a8ddf79c23287
 DIST async-container-0.16.13.tar.gz 24969 BLAKE2B 94345cff96924994b07bb70db48064122c32cf07a65736a7db709087c0f4f9bd06c3810a1b04e4d4625ebfccb6c595188e96c64025822ac318ba636a98f85a82 SHA512 c36d98eb99c65eada8463b5b95c81ffb7e80d898edea823e9e45a3dd657f81e7cc291a79b267bf26fba577b4b86844ed70c74d55c684c09da9e6f950516878a7
 DIST async-container-0.17.0.tar.gz 25019 BLAKE2B 713caa99e9649fd45dee53bf13fad75178a7f8a880f940ec422c17d3c1402099b75b70cf0c2bd93c9cbd84fc576df881559a2f6ab16e47ef780d83650c5eb66e SHA512 48b109c75b45796c95fcd938538aea8c3c829520496e58d06f1c047d83a2c3950c38fc004dcda425b42d85c626b8bbd1d3784ae23911b786fc576b13ffc6af88
 DIST async-container-0.17.1.tar.gz 25024 BLAKE2B da7d268dd7f8c599068f6f588c966866d5ea495d0f6112317f8910cb3e4974826915f9cdc3847faf09306ea01ed00cb1ced77b5197b58bbc44d584d05b1758e5 SHA512 5f57760820a621e303205bfa134da59ebbde3c017e71bf2a9bce8a511937b83060939798a9682c6eb15f99a4be657dc18cc8a5fc5f260ea8427ce2d6d70f6e44
+DIST async-container-0.18.0.tar.gz 25787 BLAKE2B 8c0d41a884231136bca19161e6d49074d0ad2571c323ff5120ce848bb7cdfbd5971724a17a6b3537c32f71731067ac2a61149d4eeb1c11e69c0f7c934a4f2412 SHA512 b7bc90173032fb6b4875d8e300748ebbf42f6088cb3c9a5249ac79c6f9cee9b4542c106e6a5f775b990e62778dd779048212f734bcec4d7cdf3dbfc7301d40cf
 EBUILD async-container-0.16.12-r1.ebuild 1307 BLAKE2B 7aa1ffe42bc316093f3f115d93b67b0bb8285863e503420d26043aa6f4bbd54a7174cf2fae2c403b467c4ee78dcc244ead221648280458651775c7401a91737e SHA512 432613ab08530758f9d8ad2069e1210ae8a6c4ac3b776d4d9841211a9543397274eaea0d84484a69db4c97dffd5e5c6059bf22c3d23bb4c856ca1de2631891ea
 EBUILD async-container-0.16.13.ebuild 1274 BLAKE2B f2225464ebc3da7de85080b2e544cae6c16dd0d8e71b1d6fcd6bc6f4f57c2de3f29ef3c930fc894d88da648adad5cb947c212197403dad3734ceb38e6cc78bdc SHA512 4f4dccf2675eb844beced778f4153ae09cfa4d73aaeef359a16412f91997f24d27c96fab4beb144fc71e691a882065d4430dc178b00e18a0eb1eb34b76e55080
 EBUILD async-container-0.17.0.ebuild 1274 BLAKE2B f2225464ebc3da7de85080b2e544cae6c16dd0d8e71b1d6fcd6bc6f4f57c2de3f29ef3c930fc894d88da648adad5cb947c212197403dad3734ceb38e6cc78bdc SHA512 4f4dccf2675eb844beced778f4153ae09cfa4d73aaeef359a16412f91997f24d27c96fab4beb144fc71e691a882065d4430dc178b00e18a0eb1eb34b76e55080
 EBUILD async-container-0.17.1.ebuild 1274 BLAKE2B f2225464ebc3da7de85080b2e544cae6c16dd0d8e71b1d6fcd6bc6f4f57c2de3f29ef3c930fc894d88da648adad5cb947c212197403dad3734ceb38e6cc78bdc SHA512 4f4dccf2675eb844beced778f4153ae09cfa4d73aaeef359a16412f91997f24d27c96fab4beb144fc71e691a882065d4430dc178b00e18a0eb1eb34b76e55080
+EBUILD async-container-0.18.0.ebuild 1274 BLAKE2B f2225464ebc3da7de85080b2e544cae6c16dd0d8e71b1d6fcd6bc6f4f57c2de3f29ef3c930fc894d88da648adad5cb947c212197403dad3734ceb38e6cc78bdc SHA512 4f4dccf2675eb844beced778f4153ae09cfa4d73aaeef359a16412f91997f24d27c96fab4beb144fc71e691a882065d4430dc178b00e18a0eb1eb34b76e55080
 MISC metadata.xml 351 BLAKE2B 671a90bb6d0e6ee6c41c96beaefba1bf84f236b557c8116d8489da01f034edbd3a122063df64a85c587cc114455b9d9e00404307d1539c8fd8e79c781297e337 SHA512 402376317da59de4bc9f10422743898870efb6f9429ba07fc37861e3c4752b4ef2197051b81bef300d07279c6bf55f9c5796a5b5c84cab8dcaef9a07537ff725
diff --git a/dev-ruby/async-container/async-container-0.18.0.ebuild b/dev-ruby/async-container/async-container-0.18.0.ebuild
new file mode 100644
index 000000000000..f5d1fac12ae8
--- /dev/null
+++ b/dev-ruby/async-container/async-container-0.18.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="sus"
+RUBY_FAKEGEM_EXTRADOC="readme.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Abstract container-based parallelism using threads and processes"
+HOMEPAGE="https://github.com/socketry/async-container"
+SRC_URI="https://github.com/socketry/async-container/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/async
+	dev-ruby/async-io"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	>=dev-ruby/async-rspec-1.1:1
+)"
+
+all_ruby_prepare() {
+	sed -i -E 's/require_relative "(.+)"/require File.expand_path("\1")/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	# spec/async/container/notify/pipe_spec.rb directly executes "bundler" command,
+	# so we can't just wipe out gems.rb as usual.  also must remove covered from gemspec
+	# for this reason.
+	sed -i -E 's/gem ".+"//g' "gems.rb" || die
+	sed -i -e '/spec.add_development_dependency "covered"/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid test dependency on unpackaged covered
+	rm -f config/sus.rb || die
+}
diff --git a/dev-ruby/debug/Manifest b/dev-ruby/debug/Manifest
index 2c01ffbadd56..07223ae1c113 100644
--- a/dev-ruby/debug/Manifest
+++ b/dev-ruby/debug/Manifest
@@ -1,9 +1,3 @@
-DIST debug-1.7.1.tar.gz 159697 BLAKE2B f3fc6b75c45992ef12d7bc6cbc3d3e65bde782ab399aa5c6643752c7337ab5e31dba5a22b3a36a0b345f3017147aed987b35184c789d8e32d3283cdff0f08a58 SHA512 6ff242862e05c48b2021b128d12c0ad9a6ed67954d0e7a60538eddabeef83253a613c13aac21b5b00516861fc0553351525fb190dfbc196e9da42e217d3b4e93
-DIST debug-1.7.2.tar.gz 160575 BLAKE2B b1f2d17f0ecae09113b1a8afeb8d63d07d9ab27f32efb6aab45a9bbfee851bc8068aa5a2cae1a659c4922b4fc1b72d8ff107a16e8b80d740914622032c39b4fe SHA512 b9108e990a66f87d4a18ce7a8bd591601359940e993635bcaa4b2d8a403a3a44dffa5f5380e65cf2335449111bd30ae9ee35dda92578e46afdbbbe7706bb5aa1
-DIST debug-1.8.0.tar.gz 162452 BLAKE2B 7fc81053b47801717325a4db79d9d9be0defb2023485a370e26cda51a7207ef6fc17eb42ffec56123ce7abfb4d9924f15687262e34f6bdc641bdca9f75631cd1 SHA512 c53616fb903395df65badabf3879fced70bbd43f84a684132d493af215ed7f205c5e449e8486773ca7a5ff298f41e7579b1a841b0140ec34839ff3f25b883b7d
 DIST debug-1.9.1.tar.gz 164276 BLAKE2B e34768dfc49230e78ffa7c5277bf80ba9abb34ac82822981e53bfb0326fb5754ae6e66946a8da8589e25aab6f5c388b266acc0a5fdf27392a570c97f90e46ea1 SHA512 eefd074968af7032410f62a0a37792fb261b3d7c1cc759d1838016bcc264baa1f205c935d76f4a8aed7ea892698d80de7db48fba1e0efd067b9b1bac9577be66
-EBUILD debug-1.7.1.ebuild 1026 BLAKE2B 894cfa1aee9c007a064005c57c7b3abdf5135a520a88771ded8f5b0a420134280d13798fdc583d7c1b4e62c100115e95b23da3b2f7a0ea6db0071bf3d506ab3b SHA512 878bed71dd0aa9564f2476d0802530019f2f5621546270abd4018ecb6e3dd57af784abbaa4fdf444a2c73df26bfe5d31ac527aad9ce0fc408547389bf1cb7961
-EBUILD debug-1.7.2.ebuild 1026 BLAKE2B 894cfa1aee9c007a064005c57c7b3abdf5135a520a88771ded8f5b0a420134280d13798fdc583d7c1b4e62c100115e95b23da3b2f7a0ea6db0071bf3d506ab3b SHA512 878bed71dd0aa9564f2476d0802530019f2f5621546270abd4018ecb6e3dd57af784abbaa4fdf444a2c73df26bfe5d31ac527aad9ce0fc408547389bf1cb7961
-EBUILD debug-1.8.0.ebuild 1088 BLAKE2B 8032f818aa7b0da73064cac86498602483119db6a1cd2fdd270a55e5d5393f1e300c0710b07fadd2e053dda74b0b163bf26b00b75e4f87b9b4add0253ed202ef SHA512 7db93bac46e6f5252622e3161b17fee12b9a69367e1b0555119eec673f4da9a87653e6c7e1d247c8a2476aae9bc5d8e34a39d85e9a192cd230b887c18e9883bd
 EBUILD debug-1.9.1.ebuild 1094 BLAKE2B 9e5ef9deec40f9d115f78e1bccb1f81bbe9d61e4c43b1153bb5ee0d180bb4c502568c55e755a2ece629bbc26c01aea0ef26e60c5516a01704e9bc791235139c0 SHA512 f74dfa0edeb5fe7a1cc722abda83bf6ddd549b4e56b897395f5aa742f44a7dd850d5cb118e9ebba80379a2c256c84b7d52db231f9d177888a4a9bbc7b3645ccf
 MISC metadata.xml 386 BLAKE2B e6fe3df0176aef095867b1378587aea3920c4d47d7fcdbfd2b65b40478025382a60067b3962445c78a088511988f24110dd7d04d3494b36f286fec20a942b773 SHA512 6c2a6ec3baa4077178b8b7daa556972dc1ccb95d22d699915a73f45a19d8eb5cdb0cd266147b0adc98b3b024b92966b8d8a121ea94f81d4b0d6f2da01cdc4e78
diff --git a/dev-ruby/debug/debug-1.7.1.ebuild b/dev-ruby/debug/debug-1.7.1.ebuild
deleted file mode 100644
index ebe6b1deeeb2..000000000000
--- a/dev-ruby/debug/debug-1.7.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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="TODO.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS=(ext/debug/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/debug"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Debugging functionality for Ruby"
-HOMEPAGE="https://github.com/ruby/debug"
-SRC_URI="https://github.com/ruby/debug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="$(ver_cut 1)"
-
-# Avoid tests for now since the results in a very deep dependency list for ruby32
-#ruby_add_depend "test? ( dev-ruby/rr )"
-RESTRICT="test"
-
-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/debug/debug-1.7.2.ebuild b/dev-ruby/debug/debug-1.7.2.ebuild
deleted file mode 100644
index ebe6b1deeeb2..000000000000
--- a/dev-ruby/debug/debug-1.7.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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="TODO.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS=(ext/debug/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/debug"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Debugging functionality for Ruby"
-HOMEPAGE="https://github.com/ruby/debug"
-SRC_URI="https://github.com/ruby/debug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="$(ver_cut 1)"
-
-# Avoid tests for now since the results in a very deep dependency list for ruby32
-#ruby_add_depend "test? ( dev-ruby/rr )"
-RESTRICT="test"
-
-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/debug/debug-1.8.0.ebuild b/dev-ruby/debug/debug-1.8.0.ebuild
deleted file mode 100644
index a150bb99348c..000000000000
--- a/dev-ruby/debug/debug-1.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="TODO.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTENSIONS=(ext/debug/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/debug"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Debugging functionality for Ruby"
-HOMEPAGE="https://github.com/ruby/debug"
-SRC_URI="https://github.com/ruby/debug/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-SLOT="$(ver_cut 1)"
-
-# Avoid tests for now since the results in a very deep dependency list for ruby32
-#ruby_add_depend "test? ( dev-ruby/rr )"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/irb-1.5.0
-	>=dev-ruby/reline-0.3.1
-"
-
-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/dnsruby/Manifest b/dev-ruby/dnsruby/Manifest
index 879855cbb6d9..ea5eb087a54e 100644
--- a/dev-ruby/dnsruby/Manifest
+++ b/dev-ruby/dnsruby/Manifest
@@ -1,5 +1,7 @@
 DIST dnsruby-1.70.0.gem 261632 BLAKE2B 07adbe23ab2d1605c1562f4403f2dd864171b047df08037763565a3a459f2d3b3cb79343da2c25aadb498a7fc5a81a42af928d65a22c6b736fa7b64fab96721f SHA512 11caddd4ea5c9b8f85c730708d3cd1e1a130059975dfdecbf307862f7cbb85285d193f9ce010a81fbd8a7518ec720a107118018146d67105f6a4dbd41149a130
 DIST dnsruby-1.71.0.gem 262144 BLAKE2B 6067bad3953eab96856adc6a30f43241c0fc6166ab3476257a502ef593ec186420d6b89c5f8e0c162bdcde5249365c02c6910e0706fbacd0425af5734b7752a8 SHA512 9488de8e6ed72708dd8ec213eb5814d8bf712a5186103cc8bcea26d9d9df1933e3d515bd2915622e643b7a37d9a94ac295f6638ac73fcf30f1dfd26c79d32c63
+DIST dnsruby-1.72.0.gem 262144 BLAKE2B 6b802c6276c32c5df6db5babb73c95f9a7c732159539197001607df89bdb144473d67252721f5f3b292cf2e5fa304611d1ce313e0cd8d09e161d4fa1867ff409 SHA512 2f2a26cc2503fb4d3521d76e4a5d476d1447439035e2bfbec0ebab34352a56f0a9c5445db15baefd7be5ba024f03d574b8b1e49a83ad4799d2c9de20e2966c83
 EBUILD dnsruby-1.70.0.ebuild 844 BLAKE2B 3807b4200fa8185a46135f9ad8dd48b10f3e39073f8807736274a11b1aa5921e3eb1e831da82f85297d1833b8519440cf338d623b32ae8456319fee0f8dfb916 SHA512 d9ea22532366b5c7da37b213c1e806759e1709a3b7f5060f119d586579d56e019471e1dc768047a8275d451f12adb422edbcf5b656f88e50e7b2a135f79653b2
 EBUILD dnsruby-1.71.0.ebuild 878 BLAKE2B 341c158e38a447af1ae0651f6af54cf037f1720778af5a537498e0830e2bafe07a875bf0f1523764985ecd9c8cc77fd8e5abe68d24da6c6e2df62c80362523e4 SHA512 b0717b72033ca8072be0e5737eb68af3de9e7e41848082d6fc5f6b64647de9771494609795b8c50b21bd0169bbb3fd87e9b07f1ffa1125ffe268a32e1184f885
+EBUILD dnsruby-1.72.0.ebuild 878 BLAKE2B 341c158e38a447af1ae0651f6af54cf037f1720778af5a537498e0830e2bafe07a875bf0f1523764985ecd9c8cc77fd8e5abe68d24da6c6e2df62c80362523e4 SHA512 b0717b72033ca8072be0e5737eb68af3de9e7e41848082d6fc5f6b64647de9771494609795b8c50b21bd0169bbb3fd87e9b07f1ffa1125ffe268a32e1184f885
 MISC metadata.xml 414 BLAKE2B c4ccb95f7844c4f0ec41dda18d5b80f8972d3f81fc571fea8feeb15ed8c0284358fa180248f2536ee0cb518bc6d48a992305eb9b1c032dcde79d25f13b6ecdc1 SHA512 e4fae933534b8a4988d008dbf8be50cd2675eb9142108c85b4c0fe4b0a06b5f553827773e08f58a09371a0cd44623c7c86c7c93fda34899614ff5b513cc33e54
diff --git a/dev-ruby/dnsruby/dnsruby-1.72.0.ebuild b/dev-ruby/dnsruby/dnsruby-1.72.0.ebuild
new file mode 100644
index 000000000000..13e241e00b9c
--- /dev/null
+++ b/dev-ruby/dnsruby/dnsruby-1.72.0.ebuild
@@ -0,0 +1,35 @@
+# 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_TASK_TEST=""
+RUBY_FAKEGEM_DOCDIR="html"
+RUBY_FAKEGEM_EXTRADOC="DNSSEC EXAMPLES README.md"
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby DNS client library"
+HOMEPAGE="https://github.com/alexdalitz/dnsruby"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/simpleidn-0.2.1:0 =dev-ruby/simpleidn-0.2*:0"
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.4:5 )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Cc]overall/d" Rakefile || die
+	sed -i -e '/display/d' \
+		-e '/Display/,/^}/d' test/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	# only run offline tests
+	# ${RUBY} -I .:lib test/ts_dnsruby.rb || die "test failed"
+	${RUBY} -I .:lib test/ts_offline.rb || die "test failed"
+}
diff --git a/dev-ruby/io-console/Manifest b/dev-ruby/io-console/Manifest
index a5e565a0b4ce..bbabb7fc8443 100644
--- a/dev-ruby/io-console/Manifest
+++ b/dev-ruby/io-console/Manifest
@@ -1,9 +1,3 @@
-DIST io-console-0.6.0.tar.gz 45358 BLAKE2B 0de9eabbc2dd218e7ff367d970133080eda36178f35655c392ba6ab73866cb7fba09fd26a16062ef1f1bab1fb941486f13e277589aa98954612d4593421afcff SHA512 25e6fc318c51dc9f8daf5743340505eea7c5364b1787862464bfb45afb99c7c7ac8c55caf1f53c5fb5921269f3827262f17449f110efbcc44f7364235563959d
-DIST io-console-0.7.0.tar.gz 36264 BLAKE2B 3cd627d8847fdfe37a95c68745b2328e9900e749e018d169f3261f8c52d4bd426b95aa833d21d1cd5a822c1caee3eb1decd1e7ab243414dd9685d4ead80d5025 SHA512 3e10df57a20903e16870526c890a8a2fc428de3f40d7a712dd1dc64fe5e9a7a69bd9ca820828e103f96aba681d05149a01167a7ee92e288283a633e333637973
-DIST io-console-0.7.1.tar.gz 36269 BLAKE2B 408579b41ad89e6ba744b4fdb84f9d17a6605c1ee7990f156e40f8276b7cbaeddf665e9d70b214685a7348797f55d789628ffd3ed0ed2c6c1b03621ab59c94eb SHA512 51b18cb47ee2884f98fe1df0656fbd85853629c06f7b82835767e1fa896013e1899dee154a7a52d7b5f3c48933a7e45550bd7f203f0b01320531c29c3554e1c8
 DIST io-console-0.7.2.tar.gz 37259 BLAKE2B 22f5f3cfedf477affa1452ce7eab862d49da1943255545f15dd519f7029e61b8747341606ebc1da7bbb020ba5f0ec7e48d08ab000da3b7192cf42ceb601b0b7c SHA512 1dd99c8e9681436a68f39f89f6104a45db2d17092f64985e36a7cd37418831b81f2749922e16ee43a633a90466a8916327a7f21249ceae2f889e70ae596c5b3b
-EBUILD io-console-0.6.0-r1.ebuild 1367 BLAKE2B 72aadc1f60ca5e5f96cd752ef5cadc20ff150ee4d4b997e9b1f73ce1141621a5e3fc98ed4e940844d15b41e72d3f941cd683d3da470585e782fe12fbbf719ce1 SHA512 e58915bfc63065324c118a1dd07c275ddd1fb54c5c79edfeff154752740e517b7b5bac120e100253c8bb2b47eadd5dae9e4166df71a7f0d76b85a794b6de9e04
-EBUILD io-console-0.7.0.ebuild 1438 BLAKE2B 76c20a7ff80de3dda0f261485a5f73c20f4e40ba845fc01aa256564f8d1ece315b7a4eed458e451fa8300d444d729255e9029fa3603e69c37ad9feaeb94b81f0 SHA512 634c05ae3d36b3d18cea2355b6e3c0593cea0d7bdc23beaa7cbc48307bd88368e852802d2df2869eec50a8d3134ca4a32a8721ae9ad624b4ab1cd6a742019fa1
-EBUILD io-console-0.7.1.ebuild 1445 BLAKE2B 3b80d97015c4a2359d063785234ee63c50307e12f018786d3bae59ed959345a516584dcb5337d006ab4c9ff4926b2d872c9586e8e03991463b103438be9da9bc SHA512 99979d7538d08c1fe1d94337af252d8443ee2cf3b8df14abd495c9281b742c6536c3ddfaa7f3b4c6eb887a1e0ac371065e5ef316bde8279affc6062c0558992d
 EBUILD io-console-0.7.2.ebuild 1486 BLAKE2B accb0dc8b19550177872c52af3bd3b9b9322e7c1a4e70ee6131e5d1d7cb9740d31ffcd6be0716544472d7a2a3f063fe71664cc0c3902e2a7d238b5945a422486 SHA512 16a0675670ab854ec15b9d6c848100542db2d9bfb27075c8bad271a2e297aaa0e8606e58ed20cf698f4dbc51da19a056dfdac70d16d34d7e15f261743228364c
 MISC metadata.xml 342 BLAKE2B 8fd9851a96fd893fd5a6163369d04bf07accc93912f989a39b8fdb0c1aab73c1df0acfb1a565b75ba617629c07bf61589f7e77b64feb16dc3e1138bcda663788 SHA512 58bc013a81541638df5e9891cb587ab49ae06dbe14f221b5f1871f518e7d90a81869a625b7e49e4e62b7d55dfee5d3c607e93de3abb4588d276d26e22ef4622a
diff --git a/dev-ruby/io-console/io-console-0.6.0-r1.ebuild b/dev-ruby/io-console/io-console-0.6.0-r1.ebuild
deleted file mode 100644
index cf7f09a499b6..000000000000
--- a/dev-ruby/io-console/io-console-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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_EXTENSIONS=(ext/io/console/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/io"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="io-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="add console capabilities to IO instances"
-HOMEPAGE="https://github.com/ruby/io-console"
-SRC_URI="https://github.com/ruby/io-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -e '/task :test/ s:^:#:' -i Rakefile || die
-
-	# Avoid test that require a proper TTY
-	sed -e '/test_\(bad_keyword\|failed_path\)/aomit "requires TTY"' \
-		-i test/io/console/test_io_console.rb || die
-
-	# Remove ruby and ffi files in accordance with the gemspec. These
-	# are only used when using a different ruby engine like jruby.
-	rm -fr lib/io/console.rb lib/io/console/ffi || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/io-console/io-console-0.7.0.ebuild b/dev-ruby/io-console/io-console-0.7.0.ebuild
deleted file mode 100644
index 6acd5a18732c..000000000000
--- a/dev-ruby/io-console/io-console-0.7.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/io/console/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/io"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="io-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="add console capabilities to IO instances"
-HOMEPAGE="https://github.com/ruby/io-console"
-SRC_URI="https://github.com/ruby/io-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
-
-all_ruby_prepare() {
-	sed -e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -e '/task :test/ s:^:#:' -i Rakefile || die
-
-	# Avoid test that require a proper TTY
-	sed -e '/test_\(bad_keyword\|failed_path\)/aomit "requires TTY"' \
-		-i test/io/console/test_io_console.rb || die
-
-	# Remove ruby and ffi files in accordance with the gemspec. These
-	# are only used when using a different ruby engine like jruby.
-	rm -fr lib/io/console.rb lib/io/console/ffi || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/io-console/io-console-0.7.1.ebuild b/dev-ruby/io-console/io-console-0.7.1.ebuild
deleted file mode 100644
index 4252f0b6170d..000000000000
--- a/dev-ruby/io-console/io-console-0.7.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/io/console/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/io"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="io-console.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="add console capabilities to IO instances"
-HOMEPAGE="https://github.com/ruby/io-console"
-SRC_URI="https://github.com/ruby/io-console/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
-
-all_ruby_prepare() {
-	sed -e 's/__FILE__/"'${RUBY_FAKEGEM_GEMSPEC}'"/' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -e '/task :test/ s:^:#:' -i Rakefile || die
-
-	# Avoid test that require a proper TTY
-	sed -e '/test_\(bad_keyword\|failed_path\)/aomit "requires TTY"' \
-		-i test/io/console/test_io_console.rb || die
-
-	# Remove ruby and ffi files in accordance with the gemspec. These
-	# are only used when using a different ruby engine like jruby.
-	rm -fr lib/io/console.rb lib/io/console/ffi || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/irb/Manifest b/dev-ruby/irb/Manifest
index cfee6daa957f..39ae6fc566fe 100644
--- a/dev-ruby/irb/Manifest
+++ b/dev-ruby/irb/Manifest
@@ -1,9 +1,3 @@
-DIST irb-1.11.0.tar.gz 127838 BLAKE2B a5786dad54f50d146086950c44d5e48029e6528ef647266199061415b67c7378d12237b002a3afdbe0ae555b52c7bf58156702402881d22e6d390dbc4ea8c50d SHA512 60f6a80ed29278fd41a8874de8b1a6d977f5c92ab6cf769052676eb12c8baae48454243602f047ff2749e7a63cbed1766bf05f4793574e7c0a922e8de3689926
 DIST irb-1.11.1.tar.gz 128341 BLAKE2B ec2ebfd31b7d784668ed043d32b86bc0f77481b250170911332f4b9810f0ee5245ec65aac4d2fa4fc94f49c5d3fa59dd7c3a709f712d9f7f4c1ed6ddd7f0e2b3 SHA512 6b8eaf41410d43f4ab47961b56ce054f93e134e5cba51a08294baaa6de149a209e243a9cf649091f3176adfd0c22943fe222b61b0ab1215e0822d7007c154f17
-DIST irb-1.7.4.tar.gz 115221 BLAKE2B 8905dbad13363fff33ae719258673d1818e3eb7dfd508254d3f2bbb28e315be2fe15614ea63cef7718a2da4a7c4ef99dc9bc76d270b5219203751dc06a7161de SHA512 562ca1deb78223f6b0b9534d9d1756d8eaffe8dfb7f550238a4afabfb42622109716ccabdef805d8aa2c14dbb73abad8a32c0261c04064281216d40bc57b87ad
-DIST irb-1.8.3.tar.gz 112981 BLAKE2B 513d62f33969e26861da18c1e73140894422ac47fd1943f1360e12732473872e9d06ac00b115ad39d7cbee36dbbea691f2e6e19970adb2677051371c4ae0ede1 SHA512 7b3cb2659cfde36bebd370cc4ac2648ac7b8672e6f9edc0fe3bcbe0a8a0ce9e75aa1b6bae3139e77975bd53cf874bb5e180044467bf17a865e73a3f5ab6b2abb
-EBUILD irb-1.11.0.ebuild 1463 BLAKE2B d513459d85ac990a8f124cd337e69d077a4d0129a03c1532f5a7fc38b0348957e38b918543ea7b3877c989fc48481bb924ab117daff77b845e540e064a377872 SHA512 a1091960c306bc7bd00e144c70210227955d2a4ae93b932ed6a383da0f656290734574b0fd98bc6b87eb1855a7f143a4e1b3bea57f9caf87be7acf10e77b408c
-EBUILD irb-1.11.1.ebuild 1480 BLAKE2B 541917afad17f4864c6e8f46cf754a9b29f22c4c7990887ab4c4550c73c074b37d1d524d0acd73451bbe2801039db4b9a7a576a3ae51f53c0b117ec61e2aa21e SHA512 35ff6bc6a1df54e38426702c3d777f4879911ecb1a4808870797d9b99b00f0b53f3b4fc397e8623f8a7cdb4f5b6907ea3d0e539e8c97101b49ee9ee585578bab
-EBUILD irb-1.7.4.ebuild 1416 BLAKE2B 46298c730b0fb2b51365cf1efca8161a12d4d2517542c14a1fcb1ba655729a46e249f07251e92ac08bea751c63c6fa4f92014e17330e95c7903ba66a25ae2f93 SHA512 61817625f5219c96375534fd54e4f19bebf3e1fe2d73f49ab1d79bca9bc3f182c4811aee0f8089ff81c113f4f9af8176ed67261a2a5db6df2f64f64d2a1e900d
-EBUILD irb-1.8.3.ebuild 1469 BLAKE2B b09ffac1e7b4d74bd4d902fce943460dc11b716624b2a5347786e059f3ce60ec79069eb843996640f969e196779c240b9cf37e0488592a5afa9510bb8760e0ab SHA512 ce8d94943c3333c2e50d8e3d8d53cd4b7fc7d29180f463216d98a276e6024c1409921eb82107da3673fc0e6782202b7af08011715466db2b0db7788703d0ecd4
+EBUILD irb-1.11.1.ebuild 1506 BLAKE2B 45a938ea5e7dea8dd570987f716b91aca3e5ed03ee6a527e8c1bdd433cfb6b6f92db274d005b54def2f788c3294c2e0c4ffb29811b86bf2bc3c88874ac317426 SHA512 f76da189ecf860fddee10155eb32e88ad5c3b3fe6a0fc195994da942c1b7e7499829415a477183abf7d30e51d60aaa4121d6235e68c0a9186de9b37d36785930
 MISC metadata.xml 335 BLAKE2B 6eaf8bbdf5e2083121d0c8833b616e8ccfd82715cb701266d9e1819634ccbe1e308bac8a1894559af941810c84f36c5cbc83f1aa02f48ab5ab3d0d3458fc6b85 SHA512 4240cfcb50e6d5551333400723b3ad0df9096a3b5517655279de6b3d31c6f30068e4897c79761fdbb68262681a79059349e1b4eb3f5d1e6b1855dfb6b6d54399
diff --git a/dev-ruby/irb/irb-1.11.0.ebuild b/dev-ruby/irb/irb-1.11.0.ebuild
deleted file mode 100644
index 8aa1bfe33ab7..000000000000
--- a/dev-ruby/irb/irb-1.11.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="irb.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Interactive Ruby command-line tool for REPL (Read Eval Print Loop)"
-HOMEPAGE="https://github.com/ruby/irb"
-SRC_URI="https://github.com/ruby/irb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-# Ensure a new enough eselect-ruby is present to avoid clobbering the
-# irb bin and man page.
-ruby_add_rdepend "
-	dev-ruby/rdoc
-	>=dev-ruby/reline-0.3.8
-	!<app-eselect/eselect-ruby-20231008
-"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
-
-all_ruby_prepare() {
-	sed -e 's:_relative ":"./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Skip test requiring specific character set
-	sed -e '/test_raise_exception_with_different_encoding_containing_invalid_byte_sequence/aomit "charset"' \
-		-i test/irb/test_raise_exception.rb || die
-
-	# Skip tests requiring a working console
-	rm -f test/irb/test_debug_cmd.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rake test || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/irb.1
-}
diff --git a/dev-ruby/irb/irb-1.11.1.ebuild b/dev-ruby/irb/irb-1.11.1.ebuild
index 53814048d1d4..a693b0845c3d 100644
--- a/dev-ruby/irb/irb-1.11.1.ebuild
+++ b/dev-ruby/irb/irb-1.11.1.ebuild
@@ -28,7 +28,13 @@ ruby_add_rdepend "
 	!<app-eselect/eselect-ruby-20231008
 "
 
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/bundler
+		dev-ruby/debug
+		dev-ruby/test-unit
+		dev-ruby/test-unit-ruby-core
+	)"
 
 all_ruby_prepare() {
 	sed -e 's:_relative ":"./:' \
diff --git a/dev-ruby/irb/irb-1.7.4.ebuild b/dev-ruby/irb/irb-1.7.4.ebuild
deleted file mode 100644
index 9fe1c976ddcc..000000000000
--- a/dev-ruby/irb/irb-1.7.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="irb.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Interactive Ruby command-line tool for REPL (Read Eval Print Loop)"
-HOMEPAGE="https://github.com/ruby/irb"
-SRC_URI="https://github.com/ruby/irb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE=""
-
-# Ensure a new enough eselect-ruby is present to avoid clobbering the
-# irb bin and man page.
-ruby_add_rdepend "
-	>=dev-ruby/rdoc-6.5:0
-	>=dev-ruby/reline-0.3.6
-	!<app-eselect/eselect-ruby-20231008
-"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	sed -e 's:_relative ":"./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Skip test requiring specific character set
-	sed -e '/test_raise_exception_with_different_encoding_containing_invalid_byte_sequence/aomit "charset"' \
-		-i test/irb/test_raise_no_backtrace_exception.rb || die
-
-	# Skip tests requiring a working console
-	rm -f test/irb/test_debug_cmd.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rake test || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/irb.1
-}
diff --git a/dev-ruby/irb/irb-1.8.3.ebuild b/dev-ruby/irb/irb-1.8.3.ebuild
deleted file mode 100644
index 9414ac9f48ea..000000000000
--- a/dev-ruby/irb/irb-1.8.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="irb.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Interactive Ruby command-line tool for REPL (Read Eval Print Loop)"
-HOMEPAGE="https://github.com/ruby/irb"
-SRC_URI="https://github.com/ruby/irb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE=""
-
-# Ensure a new enough eselect-ruby is present to avoid clobbering the
-# irb bin and man page.
-ruby_add_rdepend "
-	dev-ruby/rdoc
-	>=dev-ruby/reline-0.3.8
-	!<app-eselect/eselect-ruby-20231008
-"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit dev-ruby/test-unit-ruby-core )"
-
-all_ruby_prepare() {
-	sed -e 's:_relative ":"./:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Skip test requiring specific character set
-	sed -e '/test_raise_exception_with_different_encoding_containing_invalid_byte_sequence/aomit "charset"' \
-		-i test/irb/test_raise_no_backtrace_exception.rb || die
-
-	# Skip tests requiring a working console
-	rm -f test/irb/test_debug_cmd.rb || die
-}
-
-each_ruby_test() {
-	RUBYLIB=lib ${RUBY} -S rake test || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/irb.1
-}
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 1535d41bc424..83d5dbc0d344 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,5 +1,5 @@
 DIST json-2.6.3.tar.gz 133077 BLAKE2B f6101f533159fb689b6bf22975137d34a77bd0926c164a9c14f2d5eab982778538ec40551709e8a6470f05e78584a3e5680be740314bb7829b48feb32fb258ae SHA512 1bf9125266d8cdc565deb9e2fe3c884a1fc8d2f3b31caae67a154d0c47e30305074c1c08b49d180dd785c766762b46d3b3ef85919d53388797fcc2f37675317c
 DIST json-2.7.1.tar.gz 125655 BLAKE2B 9921b8dd26123d27b752d3dd633f788437a1aa2003b09ad6d0f43e946362f48a8e5b8dcc70d08f61cc9affa2578750e40c5a78d3bf88e0417af8890100987c79 SHA512 81e7cf51363095088142a7ac15428765f296e9b8c205946abf9ab98ddf7c57aa732c8111e6b0e239606645dfbc24dd40fbe981a52ab2d9fac97c0e3fb08133a0
 EBUILD json-2.6.3.ebuild 1391 BLAKE2B df2a6931baf0f5e326101992d3f12a9741136c4f7f7ee8507a9d9e90a6bbd772e01c6dd130dcf736ce0e51b154af543bd2aa058519482193287192da4a69fb70 SHA512 ee4e15ffb2254af61a875532712936c7c5215cc5332b739b5645aefdd0739a0567b22e0da8c1faeacbabc28884d824cf29c2847d7deb8861fea47888d55f7416
-EBUILD json-2.7.1-r1.ebuild 1510 BLAKE2B b533fc1191fd71335e7c0c990aabb6434e3280da6f1e3784f1afe4c5d4d8e7b53b665abe031895e36575b7cd1a9192c1f33e815a200c015d589e3290826f1cac SHA512 77e1c440d39e2e96aba76a4a6c3f40c34b1deb81212ce5ece57987c513b53a3288f6fd412faeb49f437fbd905b5622ddcbd53a6269e603525bf1ce2da310e092
+EBUILD json-2.7.1-r1.ebuild 1544 BLAKE2B ee7d13eba7d2335979de854c32bd7aca7d3ed077755ffc8d834a249776dd19747a4fed1d45d2f19f07be15a200638382e04a1980122c76a49947c45da90773de SHA512 3fa640a24a6382d8c98feca60416ee50d15a873fdaccb0d503a93147d0d1dc61811118d084ce2a62ebf7e8c29afe80920bc0d2e631c621db8db66494311a0d5b
 MISC metadata.xml 337 BLAKE2B 6b424567109cd8947377b5f955a9b32d3c12a25001e8d68cf62ac753264a0d8785f0fc60fc2ffbe5ad4e7a16ebd763add075820e4e559b50f6a230ef2f7a61a5 SHA512 e6900f34ad0c2a8310286eae9942432533dd78a14a04fb5d2551be21437cacc1a2d83b40ec93e885b30626cf49491f7db8a19b6e16009b6931cb0fd0c8ca8d5d
diff --git a/dev-ruby/json/json-2.7.1-r1.ebuild b/dev-ruby/json/json-2.7.1-r1.ebuild
index 178fac808b33..e35c42b886fe 100644
--- a/dev-ruby/json/json-2.7.1-r1.ebuild
+++ b/dev-ruby/json/json-2.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -29,7 +29,10 @@ DEPEND="${DEPEND}
 
 ruby_add_bdepend "dev-ruby/rake
 	doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/test-unit:2 )"
+	test? (
+		dev-ruby/test-unit:2
+		dev-ruby/test-unit-ruby-core
+	)"
 
 all_ruby_prepare() {
 	# Avoid building the extension twice!
diff --git a/dev-ruby/reline/Manifest b/dev-ruby/reline/Manifest
index 6787df8357cd..3952877fe086 100644
--- a/dev-ruby/reline/Manifest
+++ b/dev-ruby/reline/Manifest
@@ -2,8 +2,10 @@ DIST reline-0.3.9.tar.gz 87794 BLAKE2B 01711129ad0f1f45cee1797f0723a46c72d39d347
 DIST reline-0.4.1.tar.gz 93299 BLAKE2B 685855066744b957256c16475158dcf0246643a069a3e84641a556dc4163ce81d6743a824c921ae8d0aad3d98a12f6df7e71307f65d2356bfa5546f277c1d911 SHA512 e026ea6b36f3cc76db176630c0c050de784e52e5c90a3a0b2241382515ff7369f4bd452a51fd3f1eb6777bc5cf07864609a60b0ea8a6b3ddef4869c915e3edf5
 DIST reline-0.4.2.tar.gz 93446 BLAKE2B 46733b3e27b0f015cfecced252dae0050425036921c3d99498a4bd4988be0a10686fc02a31870a57b9daf094f71063c03d461dce93edb98faf8f0095e2545d88 SHA512 a8ae5590bb3463037cf3952224f3baa0e8591d47c006b43f3c404d2d984f2f0a3f6ec91daac1fd6be05f972420dbccfaed19e2aba084d1e6a6ef396e1f2ddabb
 DIST reline-0.4.3.tar.gz 93606 BLAKE2B 9faf8e2db40e75285163a6b8d587198b96faa67284b276e2a96d03b074d2f1abed01aa49a770bad96e066d0d6214319fb84b09a07754b93e2298896641babd73 SHA512 7a6c054dd187ed804ea730845af1eaace094d25e5fc5a9c02395e3886f493a79922cb624dd16d9000f193baf2d3cb147a57737235b289e1382a92e34c59d7dfe
+DIST reline-0.5.0.tar.gz 88882 BLAKE2B 822c8b4d73fee5545c8b6e6ad0a7f4e3ecf0c67f6493835f47b7cf2c3d653296463cd3cd0f085d182cd5c2ab33551a125bcfc048bb288e602b812ec921de2e9a SHA512 ff988a5007385d50c4f29403be2f85d3a3d559121b4ffc0bffd697b061efcaaa49e1bdaa36bd3b505a8f3cdfacd4b4198f3dd84e0d91014b56deec34a66bd153
 EBUILD reline-0.3.9.ebuild 891 BLAKE2B 3f869d5b1004d5044f13b6815aca3ca3a7475d5a9da365a2a6e474e8df6fcccdba57985ea2e2db8d471c9a3954660898df45e84fce383a9a1ba1ed11023d8d58 SHA512 a6a39594b93efea7d43bf1ea74bf71a7239b64115f0a168831f645a0e60c674df6bcbf98bb47e2edbae744a375f1ea8b904309d5d5abb827e7f9035fbddeef7b
 EBUILD reline-0.4.1.ebuild 933 BLAKE2B e55bda48de9c433367e9ddbd75f4eebbae48a0ec0a10716e51c2464e7a0708a009a4b24eac53b0771ec6398e990b0b8224ac99348f84adacbd6850ab7d9fa659 SHA512 1415fd68028531a469068a0b2c926317f986aa934f611561346f029feb0544e744924aff18c62f7f5f3826e9407dc04bf6d4921fa904fa6a129d06ff247b0e67
 EBUILD reline-0.4.2.ebuild 946 BLAKE2B 6a43ea60993a97d1967a765428b9a0275a31440007652e25c1f03777645beae04ce4764cfa6ed9361c26a5f70b532555e68e740c013149f1fd41bafcdd0b5924 SHA512 3a4d61212c723ad2594b0bf634683744054cfcf21bbfca9268b91c1f6165bbc9f9f74bdbe851333e13cb1c2b134e54557336f3f3e1508851a895ac697bce4a18
 EBUILD reline-0.4.3.ebuild 946 BLAKE2B 6a43ea60993a97d1967a765428b9a0275a31440007652e25c1f03777645beae04ce4764cfa6ed9361c26a5f70b532555e68e740c013149f1fd41bafcdd0b5924 SHA512 3a4d61212c723ad2594b0bf634683744054cfcf21bbfca9268b91c1f6165bbc9f9f74bdbe851333e13cb1c2b134e54557336f3f3e1508851a895ac697bce4a18
+EBUILD reline-0.5.0.ebuild 946 BLAKE2B 6a43ea60993a97d1967a765428b9a0275a31440007652e25c1f03777645beae04ce4764cfa6ed9361c26a5f70b532555e68e740c013149f1fd41bafcdd0b5924 SHA512 3a4d61212c723ad2594b0bf634683744054cfcf21bbfca9268b91c1f6165bbc9f9f74bdbe851333e13cb1c2b134e54557336f3f3e1508851a895ac697bce4a18
 MISC metadata.xml 338 BLAKE2B a47d42d46142bee439c1d169aae8da07bf1ab6b3789581b6d60e0852c64c3416804d0ef7bc899670af232ddfb9d10a3c23805da58b854ee220142617c8d6e834 SHA512 e02a8889f308d81ade723c4a912d54c67a112f1aa67218065b6b8acad0c2cf2691c2bdbb2d9dcd63eab569b1c50ef2402ed42f9711dbf514a14bff6de55f6210
diff --git a/dev-ruby/reline/reline-0.5.0.ebuild b/dev-ruby/reline/reline-0.5.0.ebuild
new file mode 100644
index 000000000000..a779c43093ce
--- /dev/null
+++ b/dev-ruby/reline/reline-0.5.0.ebuild
@@ -0,0 +1,31 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md doc/reline/face.md"
+RUBY_FAKEGEM_GEMSPEC="reline.gemspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Alternative readline implementation in pure Ruby"
+HOMEPAGE="https://github.com/ruby/reline"
+SRC_URI="https://github.com/ruby/reline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+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"
+
+ruby_add_rdepend ">=dev-ruby/io-console-0.5.0:0"
+
+all_ruby_prepare() {
+	sed -e "s:_relative ':'./:" \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test/reline -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/rexml/Manifest b/dev-ruby/rexml/Manifest
index c90a798c8687..cca3a19c418c 100644
--- a/dev-ruby/rexml/Manifest
+++ b/dev-ruby/rexml/Manifest
@@ -1,5 +1,3 @@
-DIST rexml-3.2.5.tar.gz 447881 BLAKE2B 4b922d51f9331ae17c2deaf3c617fbb6130b111ec0fe27892e524b89f298c3b962e64ab276b71213f3482c0a480b52cf71b3866aacc45fd6de82589baff81354 SHA512 9c62b789988b407bf4b02906768300b256734bfa342ef6b3551428ba2c1792b7e7e5a5480251d7df52318a5e5155757ab1377c0cc8d1d7c33278f33e367a5ca5
 DIST rexml-3.2.6.tar.gz 459069 BLAKE2B 737b4a8836cae8614bc7a8e579f5c141e3d0e2114a6f6084a186795fa2d0a0008a7cb5d5a8c493b3a4204a901a26c617054ef3b93a7ed845b2f3398f5e25f5ca SHA512 bbf278ed25fbf4d814de9df3cbca691ab43d4e502a02b081e894ce82c161b1931d850df54074ef81c9cb470dca10a81c631da7ccbf908401818fca4c9a4aa5c4
-EBUILD rexml-3.2.5-r1.ebuild 895 BLAKE2B 3210b1055eab745998a0dfd9275e27c4f33883f53806e4ab1a2d3b1fa9ced2eef976f9c2f68e02b0a2123568cbe62dfaf98ab9cc096880e8975de0f4b3cd8099 SHA512 1fbff0184093559728030dcd97022775ec1dded2d5a5a9cec09e0b4ca15f4f0ae50517ecc0733a84f6a9f62d53b06c83a39d00027366b6f274c842e9b07bfaf8
 EBUILD rexml-3.2.6.ebuild 888 BLAKE2B 00a886456bb8c390725ee5d34ae6e97f4ff55a3d98a297c804cba8df75a631752a6340f1643ae0b81ec3ee61ede9838390d520690a3c98c85ae62e2d68fc5054 SHA512 5d79ee382cfb5ad54f5d5775d4517fa275e81d3430823195493d00dbf3cb808a72c319d18c0943da93e5fa813eb8367d3cc72fe18b0a5a4957c1fe8cd0513253
 MISC metadata.xml 337 BLAKE2B 32bcd67d98d6c5b679142524dceab3a59b093b38dfe4d00d1ea01c72b659755e8d4c1a546b5968ca86d7eceb1810eda7b671e0ffe021ea816f88755c9bb2b2ed SHA512 650d4de17e8228c24f0a6ceb5c72ab3e978c75f397c41826b33eb6e6466d965b1c42911b765f464a399f3759331df8b12e1cdf1ea84da494f9318dcc4998de58
diff --git a/dev-ruby/rexml/rexml-3.2.5-r1.ebuild b/dev-ruby/rexml/rexml-3.2.5-r1.ebuild
deleted file mode 100644
index eb3493aa2530..000000000000
--- a/dev-ruby/rexml/rexml-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,33 +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_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An XML toolkit for Ruby"
-HOMEPAGE="https://github.com/ruby/rexml"
-SRC_URI="https://github.com/ruby/rexml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-
-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"
-SLOT="3"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-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
-}
-
-each_ruby_test() {
-	${RUBY} test/run.rb || die
-}
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index aa75c4552c0e..ce34d58bcc97 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -1,4 +1,4 @@
 AUX sass-3.7.4-use-listen-not-sass-listen.patch 479 BLAKE2B 8ce894c58bf4529cf2aaea3a5e247731ae1a56afafec17f7dd2df6e35d7de0ff9330d4fe2bb088fd3dbcbad3503c20afc65242228da0db4c81de356aa8a999dd SHA512 9dbad64cc59515806439ce5528875e258c2b5731d58a47db2c991e7d4e6e0e9e9bdad654abb435f64b3c9b075979f9e3d89266a8aa4ae817252ab3402f3d3b7e
 DIST sass-3.7.4.tar.gz 401442 BLAKE2B 52abe37390282d2aead3eea6c2a049da529a5e96bac44b01ccded1e3c4d2c332d82f164da941413c0138fd3a94f59cda084d8fb724db87fc522f33dd7bc31adb SHA512 4bebb6ddc84e7f2687d9b801e6b30e897d83a46940249349d775e0139d1fca8ffd96d0976f4c35a7a0dba9ebf786883a70aff2ff002708e28b685a034634aaf2
-EBUILD sass-3.7.4-r2.ebuild 1704 BLAKE2B ed05cd1be7232f86178d70869905f53cf2561c84843e84521b9e7959fd2eaf6a82cf0cd202dfd5ce49b2afdfaee60f20a16b5fb31d2144ea9f548327c260eb7f SHA512 0cef718b922be009d44020a6b47c68a677edee411def4e6094e04386b21570f267fa6b187f328fc326d207581f7772ceb0783a0ec5d75e1e94d3249f0d082483
+EBUILD sass-3.7.4-r2.ebuild 1621 BLAKE2B bb2a9fb65ca3ae2c463d56386ab17f2c3880facacfaa17bae3d01315c61b61149047e8fb7bb65d5416d6644f0ab7a75a9395cd94bd8f19397c782a6fb4e52f29 SHA512 8df929184728a3cd64bf04f7a4a2b41c3f02e0fa7d09fc5b2e6f4caa4f2efc6bcddbca088eda69de4964d96bb21e5403ef43f46f69b4442cff914a6f3beef628
 MISC metadata.xml 324 BLAKE2B d12b9c73747bb4ab333b3bbe381d713c78d12bc5ea5c526a17744ac10a81a1cfc0dbb5b74bd507fb9bdd9ff7f180aaa24affb16cc9fc18463030749c8ce3e078 SHA512 fd1ffcf3514360716ad7fc513010f5da118896fe99d0949d8249e072ca8b554ff7ddea9bb4cb79e8a71e7eb963ae39943b613260166d6f56d18120c9283f22e5
diff --git a/dev-ruby/sass/sass-3.7.4-r2.ebuild b/dev-ruby/sass/sass-3.7.4-r2.ebuild
index 81f99a545068..06df40183f11 100644
--- a/dev-ruby/sass/sass-3.7.4-r2.ebuild
+++ b/dev-ruby/sass/sass-3.7.4-r2.ebuild
@@ -1,9 +1,9 @@
-# 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="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -21,10 +21,11 @@ RUBY_S="ruby-sass-${PV}"
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux"
+IUSE="doc test"
 
 ruby_add_bdepend "
 	doc? ( >=dev-ruby/yard-0.5.3 )
-	test? ( dev-ruby/minitest:5.15 )
+	test? ( dev-ruby/minitest )
 "
 
 ruby_add_rdepend "
@@ -40,11 +41,6 @@ PATCHES=(
 # tests could use `less` if we had it
 
 all_ruby_prepare() {
-	# Match activesupport which gets dragged in
-	sed -i -e '/minitest.*>= 5/s:.*:&, "< 5.16":' ${PN}.gemspec || die
-	sed -i -e '/minitest/s:6.0:5.16:' Gemfile || die
-	sed -i -e "/require 'minitest\/autorun'/igem 'minitest', '< 5.16'" test/test_helper.rb || die
-
 	# We use dev-ruby/listen now instead of dev-ruby/sass-listen
 	sed -i \
 		-e "/sass-listen/s:, '~> 4.0.0'::" \
@@ -56,6 +52,10 @@ all_ruby_prepare() {
 
 	# Keep VERSION_DATE around since we don't create a new package
 	sed -i -e '/at_exit/,/end/ s:^:#:' Rakefile || die
+
+	# Fix minitest deprecations
+	sed -e 's/MiniTest/Minitest/' \
+		-i test/test_helper.rb test/sass/test_helper.rb test/sass/*_test.rb test/sass/{scss,util}/*_test.rb || die
 }
 
 each_ruby_test() {