5 files changed, 88 insertions, 59 deletions
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 1cc289568079..42ca4ae03c8e 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,4 +1,3 @@
-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
-DIST mini_magick-5.0.1.tar.gz 1325633 BLAKE2B 6dce4cf3b488122732952771cd425139fa5ca33389abaa0f8ed0d797282b66247a529b5ad4cc2de569af9be00406cd4a88e60ce805f4132374aebd0a3f9a7808 SHA512 5579967be69065e1da79d11bc9de85acef4030345367ab8c57b91e26a99821a771d09bbdf8da012a9741141ceca8c4643e921dd9170209088425d7ab6ea845bb
 DIST mini_magick-5.1.0.tar.gz 1325990 BLAKE2B 5c0301cb9ee252bdc97b823aa039fdb099dfcc5fdc2aef09471806c258780a00416fb53b40b1cfb0bcf5c0fc36ee753840295abfc734c170e8e516c944423fed SHA512 5d5beedead029fbd20b7eb9b3154433e34c804859e1e59f86c855a1781961d5f0bb944d562264e22acf69bc1bb6ab49dd27f88040f1735005492ee1908ba73f9
+DIST mini_magick-5.1.1.tar.gz 1326004 BLAKE2B 1eb088cac89fa1d9c978fc663e527e6048bf312df2169604330c53c8b45e4c7500785ed4d6c271eff7d831c1fda93fba9d687c6051382dc0cf822d481a328aa4 SHA512 33faacdb6c0119addd0f554028acf1fb9218e8e3fd13eb96dbd671fb332f14f7f053d5340f024d8cdefaf6e2a8605d37458c66fbbf8307d5117a38beaeb5c09c
diff --git a/dev-ruby/mini_magick/mini_magick-4.13.1.ebuild b/dev-ruby/mini_magick/mini_magick-4.13.1.ebuild
deleted file mode 100644
index 323f31688be1..000000000000
--- a/dev-ruby/mini_magick/mini_magick-4.13.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manipulate images with minimal use of memory"
-HOMEPAGE="https://github.com/minimagick/minimagick"
-SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="minimagick-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-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] )"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/webmock )"
-
-all_ruby_prepare() {
-	# remove executable bit from all files
-	find "${S}" -type f -exec chmod -x {} +
-
-	sed -i -e '/bundler/ s:^:#:' 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 '/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 '/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
-}
diff --git a/dev-ruby/mini_magick/mini_magick-5.0.1.ebuild b/dev-ruby/mini_magick/mini_magick-5.1.1.ebuild
index c6ca8f7af3cc..20756789f5d1 100644
--- a/dev-ruby/mini_magick/mini_magick-5.0.1.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -30,6 +30,8 @@ IUSE="test"
 RDEPEND="media-gfx/imagemagick"
 DEPEND="test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
 
+ruby_add_rdepend "dev-ruby/logger"
+
 ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/webmock )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 5230f9aafcfa..b4b8549c8fda 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,3 +1,4 @@
 DIST rmagick-5.5.0.tar.gz 2045116 BLAKE2B 018d4e940043210238b6026a8bc0b65656633aaaf559954b666c75dda74c0f0fd33319a13fd6c494a6a51a3cfac67aac283e3e79d06dc90b6d4581464805e476 SHA512 f813104c347867b14281b044135fd626805d35d2afa3167c25d5e31179b31e985c5cc75deb630f8a64d20b877d8c42ce13e31e137f573467d3c5f3f2453d514f
 DIST rmagick-6.0.1.tar.gz 2045860 BLAKE2B e36ed9c2719df593cce32591111010a8d64e54ff4348ed22ebf9d840ca6f7ceec91b8097b5258bb0a195db63c422373e408f5995cef8944eac42e71d6fd00c4e SHA512 a6fdecd4ad6d17045438a9a14fc6c0a8b9d18224d6d3d0af2ade6fcba1bd0c889710f03d8b2f9738214023d87c504f7a7017f49b467a778fa3d97a14aa2bfeb3
 DIST rmagick-6.1.0.tar.gz 2048383 BLAKE2B 2d032dac7ce7d6d684ae3ed9f894dfa8e6b5d061b17d6a9118bae5bf7824da50f67cce809d26e3d68fdfcf0bc188f134891880e2fb79cd0f35269f05ef801b2c SHA512 8b00e888481991a7e991c7616e1b2575ec9e08da4d5620436439bf0cbe9cb38fa3a5b24986ba0d943c565d73dd0bf675e703a70b7fc3420df6fb932bc7bd2ccb
+DIST rmagick-6.1.1.tar.gz 2048591 BLAKE2B 5511a146cb44375a66c430bff7cdc710aa3cc3b958e4d44dba6788eebe10ec97be4fb88a25d956a25caff274b4ab4fd81308f367b5b103c5c8f850ed22a95f53 SHA512 138b2b0358ee13ce2ed005c923cb77e0e63254eddd33f92fc10c8152f54be240596448eb9e6847bf065aeb1d93763f9ad34e15fba19638318add9bec42be3467
diff --git a/dev-ruby/rmagick/rmagick-6.1.1.ebuild b/dev-ruby/rmagick/rmagick-6.1.1.ebuild
new file mode 100644
index 000000000000..530a515acdc6
--- /dev/null
+++ b/dev-ruby/rmagick/rmagick-6.1.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/RMagick/extconf.rb)
+
+MY_PV=RMagick_${PV//\./-}
+
+inherit ruby-fakegem
+
+DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
+HOMEPAGE="https://github.com/rmagick/rmagick"
+SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="rmagick-${MY_PV}"
+
+LICENSE="Artistic"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=media-gfx/imagemagick-6.9.0:="
+DEPEND=">=media-gfx/imagemagick-6.9.0 test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp,xml] media-fonts/dejavu )"
+
+ruby_add_bdepend "
+	dev-ruby/observer
+	dev-ruby/pkg-config
+"
+
+all_ruby_prepare() {
+	# Avoid unused dependency on rake-compiler. This also avoids an
+	# extra compile during tests.
+	sed -i -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/end/ s:^:#:' \
+		-e '/compile/ s:^:#:' Rakefile || die
+	sed -i -e '/pry/ s:^:#:' -e '5irequire "tempfile"' spec/spec_helper.rb || die
+	sed -e 's/git ls-files/find */' \
+		-e '/pkg-config/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Squelch harmless warning about imagemagick installation.
+	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
+
+	# Create directory used for a test
+	mkdir tmp
+}
+
+each_ruby_test() {
+	# Borrowed from media-gfx/gscan2pdf
+	# Needed to avoid test failures on e.g. ppc, bug #815856
+	# (Unclear why it doesn't manifest on amd64 here at least)
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+
+	RSPEC_VERSION="3" ruby-ng_rspec
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+
+	if use doc ; then
+		docinto .
+		dodoc -r doc
+	fi
+}