8 files changed, 7 insertions, 185 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9bfd5c7a7472..532505ae3c68 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 65ab5a611fb1..9b0cdb21e229 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -2,7 +2,6 @@ DIST sinatra-3.0.5.tar.gz 266205 BLAKE2B 16e0631ed49e62610c7bc1e43f03f21f57ee968
 DIST sinatra-3.0.6.tar.gz 268815 BLAKE2B 2993a4c28ad4559e65e6e0dc4e5f9bc25f4118f1f0d5462e0469808e873197823a13f682abb4762426860322df4408faddde037f120d370d0e206abc2b1753ef SHA512 83643b634d2a992144ced65fc1466fded29bf6fae2e20f359b2d440c46013df26f4595f842cbed36319c5278beb77383eea6ac6eb4281f508501cee4e1c6e67a
 DIST sinatra-3.1.0.tar.gz 272066 BLAKE2B 4bae4e3356adaec8f347dfc25ab9311f6740ff4f5c1486c7230269df0154e8127a4f61f6ebf47098f24848381a6e8e82429184c431cfb89c8beb9e4838135456 SHA512 b0b82a5319caf5768c830b2929f76a4fc9414adff4c32d6723a439747f756d2467c12b1391557a1afe31e5f8eab99872a51dadb59cf1cf8ace373e7a92dd5eb2
 EBUILD sinatra-3.0.5-r1.ebuild 1418 BLAKE2B 271aa29633cc26f9c208b5c393668fa0cc61824120842252503c4357f1b22026174f605f32b57814d999061377ebff5f43e6a5108201d8477740026283f9c059 SHA512 7139b0120f2351b8156cdf190cfff9f889208293c79d4348cef2663667d0c2bc0b3d1bd300b9221e3cff79aa9a6a60a6ba859da9730501325886e388e5cf4fe3
-EBUILD sinatra-3.0.5.ebuild 1162 BLAKE2B 03a501a76198e2062f4fcc7119ec7ab80f8a99b6c6101fe54944a13890feba4a9e138fa6b2c3874051b2da0bd5a7be7270fe54f5dbb8173dd1314fd92ce97c9b SHA512 5ecf1151fb089075004c87fb97913dc8ddb344f93cd1765c2b48af364bf75c6df5f9ebd02087e25d87d23275daf02a1db464cd86c2fb074b1d683b2d8a388a05
 EBUILD sinatra-3.0.6.ebuild 1261 BLAKE2B cf05bb00adf64ae7864854e9e7f97354f58f97c44fe06573d764f4e9241575016b9ef541ff783f8abb5fd208afbbe23ceda5e91f20b6d9c040e524a27305ff63 SHA512 5beb059d51e4bb3948b91d38051687d6a1736eb0ce410d6dff4ebb640aa30ee76dd1874cadf88bbfcbae27418514ee6b484d53bdc741494dbd46d9ea0441529d
 EBUILD sinatra-3.1.0.ebuild 1262 BLAKE2B 9383e9cd6fa98e3c12da36cc6e61232e9c3223a7c3d8760a233c059c6cb8a8e2018756a220393c62cbb276be3c5075d32460933bb83db5b3bfa2db58d3395432 SHA512 307fde1aa61220863b59d833bab2306cb71b96ce0f497d5886d612ab5ea1e960d7b2250c50cf434146144187cc59e29538f4216f118fc933b99019d97935afd5
 MISC metadata.xml 393 BLAKE2B 730e333a7e2203f0219040e53c2ddd3a894af807a242e62df1fdb94a2eee0350c52348a55699c80d4674f0b6024875627f68e2061b740dced0e2ebd2155e5b38 SHA512 fd922f80dcd2c7c663506680f9b6d86f810c68d1c6f81480063d3c20aa561a972f0fe837dbc636848191092c7b599d7e330ffe296e41c0da6f46dba68d2cea7c
diff --git a/dev-ruby/sinatra/sinatra-3.0.5.ebuild b/dev-ruby/sinatra/sinatra-3.0.5.ebuild
deleted file mode 100644
index 0f6a098f1385..000000000000
--- a/dev-ruby/sinatra/sinatra-3.0.5.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"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test:core"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
-
-RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="https://sinatrarb.com/"
-SRC_URI="https://github.com/sinatra/sinatra/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=""
-
-ruby_add_rdepend "
-	dev-ruby/mustermann:3
-	>=dev-ruby/rack-2.2.4:2.2
-	~dev-ruby/rack-protection-${PV}
-	dev-ruby/tilt:2"
-ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder <dev-ruby/activesupport-7 )"
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
-	sed -i -e '/active_support\/core_ext\/hash/igem "activesupport", "<7"' test/helper.rb || die
-
-	# Avoid spec broken by newer rack versions, already removed upstream.
-	sed -i -e 's/"bytes=IV-LXVI", //' test/static_test.rb || die
-}
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 3be51a540be7..3370f3e6e215 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,8 +1,6 @@
 AUX slim-4.1.0-temple.patch 1651 BLAKE2B b979b550ad138ddac448f974b3a96ca5c7b32f1586e0d3eb3581ece3fc398035bb4c6b32082a7366b946d29054ccdafa61b38adac5ff782991c070e161738aa1 SHA512 db3d64781003830fb98e331248fdaade0ee9076c6e452b06195d2cbbc6bbe7ed55c1da6c41e8ac0df9341f9c637e5cdc79142b7444f832eff870b8ea1a2b1dcb
-DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
 DIST slim-5.1.0.gem 100352 BLAKE2B 19d0bea76a932d18a39fab30d0b1f2cd4f8f2eba108d79d2992112b568461cbc854a99d70b6ea97622e1928db7f33434221a054d77c5d3fa989da639fae176e5 SHA512 2cc39659a5c36cf37e3eea240f5326552fac0be8a42ff6bfe62837467bb77f8841b34d838d5a6945ff7195eb1e59842c64e04944d6882d132819f1ffbf609f50
 DIST slim-5.1.1.gem 100864 BLAKE2B ea5c469702dca808bdc0555044a8d6a5a0b34e8d5b03a9c97e6e31ccb169725be6f76fc1f252d14673e92a53ac1a42caf023a3d1bacb66c4091710f8e9772c1a SHA512 935d488ad11478b28d51125ddbf7f0cb81f7791587bb69c7ead434eacf44c309958459dcff7228b6562b8972d6cb7125f3d451d21bfa2ded2f7ee1b55703d1f4
-EBUILD slim-4.1.0-r4.ebuild 2132 BLAKE2B f3cf006a609dec8388a77b578f6c5af6e7ae268eb374f51cc9aeb288040dddfa1ad634782655e74718d3f79d2dd60663ca2938f4fba80f3798d48d848afbf1fc SHA512 5753cb009fe5461f5750742e01a8f340aa9ba64a027d6979d3aebe68f0feda595bebf7aa7ad93bf47fe10082d5f17e113b125f43ed90cf9d6b308efb738fbc50
 EBUILD slim-5.1.0-r1.ebuild 2236 BLAKE2B 7507a967daeb1f4eb8c0d7beb8ded4d51d57c81b902dd98b45e4fb79dda227f6edf00874fb17023189b374f4747acccc964bb8d6cf4bf284a535255e4e0c9e03 SHA512 c7f67bc8b78a1749dacd0e039f1ab0016e7b834ddc6bddbde2a539ebad7643dc33d09016945cef51430bb8ec45796154cd657bc178562080003bd69292cf7bdf
-EBUILD slim-5.1.1.ebuild 2230 BLAKE2B 93f7391eb3c4f2789764e7bb023e97f32209b6d1394bbe8ff73b794ccd6dfdccdb3cc6588b6df0b58b78115b6f1802a9bd03e0ce46ae32434a986abcbfef310a SHA512 b4ee7dfce4f040931f104503ca0342781ad951cb4c8901ce1dcdfe382b79f62905fc7c616f61f47c00173fc2b5a000047913d8a864dba7ca46d1209f0febc65a
+EBUILD slim-5.1.1.ebuild 2343 BLAKE2B 401902d64fbe95670891be202cf4f3257a59651ad188d828f56a0f786351e57e9a01d59b6d8a4ec3d235b901419aed523830bd78ab9f3e5aab04d655ad1a9acf SHA512 e9498be0362105251ecde4d929e8f6d6f1b6801d193e45ba7a517b7e84f38afe7b8503a809e3658624aa686d35d3bf547a70f69510d8bfa8041bb758bc0336ec
 MISC metadata.xml 328 BLAKE2B 278b8ae81f02f38eb7a70fe1f6649cfcaa5a256ecdeaafdd1231b18050fb9b1a7e36d332ba6165867565ecc7d19ea425966d35a739950c170f151ad927ab57ed SHA512 21ea066ca55a1422879792472cc5b07a87332e5eb204b1311a5a63cbe9f33296a9ef48cba2491a50064baa3760a18285cec51882c3ca885a7cce2453a4e2234a
diff --git a/dev-ruby/slim/slim-4.1.0-r4.ebuild b/dev-ruby/slim/slim-4.1.0-r4.ebuild
deleted file mode 100644
index 9ede38c06816..000000000000
--- a/dev-ruby/slim/slim-4.1.0-r4.ebuild
+++ /dev/null
@@ -1,63 +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="CHANGES README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_RECIPE_DOC="rake"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
-HOMEPAGE="https://slim-template.github.io/"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
-IUSE="doc"
-
-ruby_add_rdepend "
-	!dev-ruby/slim:5
-	>=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
-	>=dev-ruby/temple-0.7.6:0.7
-"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
-
-ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sassc )"
-
-all_ruby_prepare() {
-	eapply "${FILESDIR}/${P}-temple.patch"
-
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# This sinatra code expects tests to be installed but we strip those.
-	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
-
-	# Add missing include, bug 816573
-	sed -i -e "1irequire 'ostruct'" test/core/test_code_evaluation.rb || die
-
-	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
-	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
-		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
-		-e '/test_render_with_creole/,/^  end/ s:^:#:' \
-		-e '/test_render_with_builder/,/^  end/ s:^:#:' \
-		-e '/test_render_with_org/,/^  end/ s:^:#:' test/core/test_embedded_engines.rb || die
-
-	# Avoid test failing due to tilt providing yet another markdown implementation
-	sed -i -e '/test_render_with_markdown/askip "new tilt version"' test/core/test_embedded_engines.rb || die
-	sed -i -e '/test_no_translation_of_embedded/askip "new tilt version"' test/translator/test_translator.rb || die
-
-	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
-		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/Open3/ s:ruby:'${RUBY}':' test/core/test_commands.rb || die
-}
diff --git a/dev-ruby/slim/slim-5.1.1.ebuild b/dev-ruby/slim/slim-5.1.1.ebuild
index a5c1188a4aa0..c914625d9a54 100644
--- a/dev-ruby/slim/slim-5.1.1.ebuild
+++ b/dev-ruby/slim/slim-5.1.1.ebuild
@@ -28,7 +28,8 @@ ruby_add_rdepend "
 	>=dev-ruby/tilt-2.1.0:*
 	>=dev-ruby/temple-0.10.0:0.7
 "
-# sass tests are currently disabled: https://github.com/slim-template/slim/commit/bd9d4601cd8142aa9fdbc0d87c9f9132a9a56cda
+# sass tests are currently disabled:
+# https://github.com/slim-template/slim/commit/bd9d4601cd8142aa9fdbc0d87c9f9132a9a56cda
 ruby_add_bdepend "
 	doc? (
 		dev-ruby/yard
@@ -38,6 +39,7 @@ ruby_add_bdepend "
 		dev-ruby/minitest:5
 		dev-ruby/kramdown:2
 		dev-ruby/redcarpet
+		dev-ruby/sassc
 		>=dev-ruby/test-unit-3.5
 	)
 "
@@ -62,6 +64,9 @@ all_ruby_prepare() {
 	sed -i -e '/test_render_with_markdown/askip "new tilt version"' test/core/test_embedded_engines.rb || die
 	sed -i -e '/test_no_translation_of_embedded/askip "new tilt version"' test/translator/test_translator.rb || die
 
+	# Fix minitest deprecation
+	sed -i -e 's/MiniTest/Minitest/' test/literate/helper.rb || die
+
 	sed -i -e '/s\.files/ s/git ls-files/find . -type f -print/' \
 		-e '/s\.executables/ s:git ls-files -- bin/\*:find bin -type f -print:' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index f5e997694a2d..962923f756b2 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,7 +1,5 @@
 AUX thor-1.2.1-tests.patch 13418 BLAKE2B 13d3fdde30676171abe62b8fb7acc0a0564eb2041658e520a0838b6fb272303db9c0fad60170707b0676a9c39950ebcab778abaaf683716dd8546620e60e1a6e SHA512 a08e95e3df2c338b7bc7f700dcf04801fa743f0dc04abf5fde1030f306b78c536da1554e06736604acfaf6bd98622b4258dcec1791339727a57384cb226f8dcf
 AUX thor-1.2.2-no-coverage.patch 752 BLAKE2B 936e3ef4ba494a8e1b221fbf2688c9487c127fbf5991ae53baf5c33e12033de17c48bfd6dbf0460f952b5db4d4a0139befe7ad683e3bffa8b9a978a0dda27825 SHA512 c8b8e833f8d133e3d2c8e507820b054245ae119a766ba7ef4009ca235d64d0f763733aac719b6c5df521b23a80c43068cfdb747659fdda514a74dcb3d330f347
-DIST thor-git-1.2.1.tgz 96638 BLAKE2B 03826d2545c61f5fd433325bc65b244921fd0ed0f030ea173fa6f558ca9fd62ac52dca829c66de32569321b3d52353f306559fa34c34e472b1aa52184ba3d812 SHA512 88e58b6ca6c812cb84ab59e0ee8afcd8fa70b6c24d403cd5ea05d1d40ac30e85f2c7412611cc176eb541d16878e309d25c7e4284f64c760475925ffe359250b9
 DIST thor-git-1.2.2.tgz 98213 BLAKE2B e71ee51eb5c982c585cf9bd9dffda8933975c9d0df8096015d125eefd0597a653887db1acfc132ce1f5a2e8ce4ab71c790a6c0bf39edd7c5e4c85a75de963944 SHA512 2c8af5d59f33691af63e813ba8dfe3392c279593f3e3ccf0ab2d6eb2ccce4220d93b7cb3413ad853e4bba14f4e2182c54caaf4944627cbcbefa31cdc0fabefc7
-EBUILD thor-1.2.1-r1.ebuild 2156 BLAKE2B 92a0bd402228056e0348a1288cc591f7fad95847a2aed072a885600ed67dc409430bc2e54a8e5d7cb53d959569cbc7563865ff7bb7536c4da62d1b151a2dc818 SHA512 9152e5aca31ced4e776c4eb6dafb419d15ffd73e7a5addd98ecc24f31f608e70ef4590abd3c96d4170dc3cb1c20e76fe7ce6368ad9dca1ecf2a0efcc320c2344
 EBUILD thor-1.2.2.ebuild 2157 BLAKE2B 18f1befd80e7fdc1647f72a0177db32b28831f5b95742a7aab052246ff00e7c85909c04890d0808af6182836acef0c6ef9bca2f95514e1c3445da9edb99a54ce SHA512 0ec3d98a34b9be07b5893400c42d2e511fa4dddcc75f28a27348cd2a8e0a8469b6cf2aa73cd9d7c15b078557d1501bec33e85da11a6f4d0689584b50fade37bf
 MISC metadata.xml 681 BLAKE2B 18af48da65edba93d19a6a8541a5a79b63485d15108736b8b2c964a57006dd8e0bcc094261045a2598ab5537c3162cffc012e35dbff7c631e45f8de1657b5cd4 SHA512 ccc14bf0262a52707216bedfa51c46d5de83b04308d6768dd73e9d63a0e807ae5f069b9730b5e88311ddf51185aaec12144ffd8540044baf2b18d1208dee380a
diff --git a/dev-ruby/thor/thor-1.2.1-r1.ebuild b/dev-ruby/thor/thor-1.2.1-r1.ebuild
deleted file mode 100644
index ea545738f4ea..000000000000
--- a/dev-ruby/thor/thor-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2000-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_TEST="rspec3"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_BINWRAP="thor"
-
-RUBY_FAKEGEM_GEMSPEC="thor.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple and efficient tool for building self-documenting command line utilities"
-HOMEPAGE="http://whatisthor.com/"
-
-SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux"
-IUSE="doc"
-
-# For initial target porting (new rubies), we can make these test deps
-# conditional with:
-# 1. USE_RUBY="<old rubies>" ruby_add_bdepend ...
-# 2. skip logic in each_ruby_test
-USE_RUBY="ruby27 ruby30 ruby31" ruby_add_bdepend "
-	test? (
-		dev-ruby/childlabor
-		dev-ruby/webmock
-	)"
-
-RDEPEND+=" !<dev-ruby/thor-0.20.3-r1:0"
-
-PATCHES=(
-	"${FILESDIR}"/thor-1.2.1-tests.patch
-)
-
-all_ruby_prepare() {
-	# Remove rspec default options (as we might not have the last
-	# rspec).
-	rm .rspec || die
-
-	# Remove Bundler
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Thorfile || die
-
-	# Remove mandatory coverage collection using simplecov which is not
-	# packaged.
-	sed -i -e '/require .simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-
-	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
-	# bug 430402
-	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
-
-	# Avoid specs depending on git, bug 724058
-	rm -f spec/quality_spec.rb || die
-
-	# Avoid currently broken readline specs (already fixed upstream)
-	#rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die
-
-	# Avoid spec failing on whitespace difference in error message
-	sed -i -e '/raises an error for unknown switches/askip "whitespace differences"' spec/parser/options_spec.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby32)
-			einfo "Skipping tests due to circular dependencies"
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec spec || die
-			;;
-	esac
-}