6 files changed, 54 insertions, 14 deletions
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 28125398a40a..7b359464a7ef 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,2 +1,2 @@
-DIST mini_magick-4.12.0.tar.gz 1331356 BLAKE2B 84d222424c354e83a041f2c6352f92d11889ed51126f90dd55ccbdbfa31974b79977bf3cf10d30c5f350d17a7dd2d20bf538c2eb78f65c58a29a81f71290acf8 SHA512 8801b4fe9cfed47eeae91cffd5364ca828f8b21d7040217d72d0f5ca9070e02f191b8f87b933c067c0d914332806f14e1b87621dbca06df047c43db8a72cd559
 DIST mini_magick-4.13.1.tar.gz 1330619 BLAKE2B ea51265c68b247c8558381e359660b649834c63cdc0de55c9bc47a2ae83ef4f592c14a7f84e12e016860363ba6326ac342481f25a4bc718c059515c30d48fd2d SHA512 2c9a55e69f3770974fa32124ac7f0da63114c17704848d3c957bcfa6b2e00d162694a4e34a25e27f8b214101d6a4bb6a9f1d0dbee597140b94874409ebea4363
+DIST mini_magick-4.13.2.tar.gz 1330632 BLAKE2B 831d6676cf2e65f857f149db77086ff9a8a209cf9aa4cfb0dc38a73e82b5d10605cf105d7126f0319203a9cae824e0b94812cf450ad5552316bbd94e21f71365 SHA512 a7a4628fe523816aef37eecfd755b84d11072c6c57134fd3b237312f302d41d2cccc2cefcbf1ef7a291d97d02b830887aa0f628140c51ca28fa9f955c6f96b57
diff --git a/dev-ruby/mini_magick/mini_magick-4.12.0.ebuild b/dev-ruby/mini_magick/mini_magick-4.13.2.ebuild
index de35c26658a2..26598e37d533 100644
--- a/dev-ruby/mini_magick/mini_magick-4.12.0.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.13.2.ebuild
@@ -27,8 +27,8 @@ IUSE="test"
 # It's only used at runtime in this case because this extension only
 # _calls_ the commands. But when we run tests we're going to need tiff
 # and jpeg support at a minimum.
-RDEPEND+=" media-gfx/imagemagick"
-DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
+RDEPEND=" media-gfx/imagemagick"
+DEPEND=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
 
 ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/webmock )"
 
@@ -36,28 +36,21 @@ all_ruby_prepare() {
 	# remove executable bit from all files
 	find "${S}" -type f -exec chmod -x {} +
 
-	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
 
-	# Don't force a specific formatter but use overall Gentoo defaults.
-	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
+	# Don't force a specific formatter but use overall Gentoo defaults
+	# and show all failures.
+	sed -i -e '/config.\(fail_fast\|formatter\)/ s:^:#:' spec/spec_helper.rb || die
 
 	# Avoid broken spec that does not assume . in path name
 	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
 
 	# Avoid spec broken by recent imagemagick updates
-	sed -i -e '/cache files generated from .mpc/askip' spec/lib/mini_magick/image_spec.rb || die
-	sed -i -e '/does not hang when parsing verbose data/askip' spec/lib/mini_magick/image_spec.rb || die
 	sed -i -e '/reads exif/askip "Now returns more complete EXIF data"' spec/lib/mini_magick/image_spec.rb || die
 
 	# Avoid graphicsmagick tests because installing both in parallel for
 	# tests is hard.
-	sed -i -e 's/:graphicsmagick//' spec/spec_helper.rb || die
 	sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' spec/lib/mini_magick/utilities_spec.rb || die
 	sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' spec/lib/mini_magick_spec.rb || die
 	sed -i -e 's/"GraphicsMagick"//' spec/lib/mini_magick/image_spec.rb || die
-
-	# Avoid posix-spawn tests because is not the default, does not work with ruby30 and appears to be unmaintained.
-	sed	-e '/SHELL_APIS.*posix-spawn/ s:^:#:' \
-		-e 's/"posix-spawn"//' \
-		-i spec/spec_helper.rb || die
 }
diff --git a/dev-ruby/nkf/Manifest b/dev-ruby/nkf/Manifest
new file mode 100644
index 000000000000..8a77413d01a3
--- /dev/null
+++ b/dev-ruby/nkf/Manifest
@@ -0,0 +1 @@
+DIST nkf-0.2.0.tar.gz 196728 BLAKE2B 198575e067d1a61aedd61468c28a55a495057a182c1f8f492ca96f38cb643698db5b00cdf9d69121d852b86859dda7c29367e62e78e21c76c69f7af22cd7f9ca SHA512 a3d06d0797368d15d118dac621c8230816ffc0af852c998f21d095acb09a3600c6d82e3f540672a2f11536e1f16c70335388e5c2dfe9f06b957caf635615bff5
diff --git a/dev-ruby/nkf/metadata.xml b/dev-ruby/nkf/metadata.xml
new file mode 100644
index 000000000000..c872c7296592
--- /dev/null
+++ b/dev-ruby/nkf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ruby/nkf</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/nkf/nkf-0.2.0.ebuild b/dev-ruby/nkf/nkf-0.2.0.ebuild
new file mode 100644
index 000000000000..130f9b05866b
--- /dev/null
+++ b/dev-ruby/nkf/nkf-0.2.0.ebuild
@@ -0,0 +1,33 @@
+# 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_EXTENSIONS=(ext/nkf/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="nkf.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension for Network Kanji Filter"
+HOMEPAGE="https://github.com/ruby/nkf"
+SRC_URI="https://github.com/ruby/nkf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1-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"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -e 's:__dir__:".":' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test:test/lib -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/sinatra/sinatra-4.0.0.ebuild b/dev-ruby/sinatra/sinatra-4.0.0.ebuild
index a02048adf7b1..66917a7fe2b2 100644
--- a/dev-ruby/sinatra/sinatra-4.0.0.ebuild
+++ b/dev-ruby/sinatra/sinatra-4.0.0.ebuild
@@ -35,7 +35,9 @@ ruby_add_bdepend "
 		dev-ruby/builder
 		dev-ruby/erubi
 		>=dev-ruby/rack-test-0.5.6
+		dev-ruby/rackup
 		dev-ruby/activesupport
+		www-servers/puma
 	)
 "
 ruby_add_bdepend "doc? ( dev-ruby/yard )"