3 files changed, 25 insertions, 69 deletions
diff --git a/dev-ruby/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index bac342d547ae..130cdb95e65a 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1,2 +1 @@
-DIST rbpdf-1.21.3.tar.gz 12071239 BLAKE2B bcfc19ab707b2e2b03752f723bb8c971b131bde2e6841832c958ea329681aaa36edb13c453173db05c2748de33962f756fc0bcf4959dda385eb4f6f081290fd9 SHA512 f169c3694df9af7fea76ed8415c79658ed12bacad4b2f3fda0ce632ced98fcf9bc256278dea52283907d33aed1632a453e4dadc43522003ab2f1a471d9818041
 DIST rbpdf-1.21.4.tar.gz 12226867 BLAKE2B 93a6f6ae9e394ca734404c5f633b83629245dba5a8201594ac4b250e48b6290869dd6fa724dcc6bb65eba57d15777b44c06c1653a03d20f41ebb19c1feaefee7 SHA512 f62f734f3d90a31f1ce2c0e4c22388ecae6ad83336bb37e25f8f8fada947363f0b03821796a388fb7271658b9141ad35d4a34c4c8d20d1a9e55ea170f568d525
diff --git a/dev-ruby/rbpdf/rbpdf-1.21.3.ebuild b/dev-ruby/rbpdf/rbpdf-1.21.3.ebuild
deleted file mode 100644
index eb4f398a296e..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.21.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby32 ruby33 ruby34"
-
-# Avoid the complexity of the "rake" recipe and run the tests manually.
-RUBY_FAKEGEM_RECIPE_TEST=none
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby on Rails RBPDF plugin"
-HOMEPAGE="https://github.com/naitoh/rbpdf"
-SRC_URI="https://github.com/naitoh/rbpdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 dev-ruby/webrick )"
-ruby_add_rdepend "
-	dev-ruby/actionview
-	dev-ruby/htmlentities
-	=dev-ruby/rbpdf-font-1.19*
-	|| ( dev-ruby/mini_magick:0 dev-ruby/rmagick )
-"
-
-# Two of the tests require png/jpeg support in "magick identify",
-# see bug 738784.
-BDEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png] )"
-
-all_ruby_prepare() {
-	default
-
-	# This test is enabled automagically in the presence of rmagick, and
-	# then fails.
-	rm -f test/rbpdf_image_rmagick_test.rb \
-		|| die "failed to remove rmagick tests"
-}
-
-each_ruby_test() {
-	local cmd='gem "test-unit", ">= 3.0"'
-	cmd+=' and '
-	cmd+='gem "mini_magick", "~>4.0"'
-	cmd+=' and '
-	cmd+='require "test/unit"'
-	cmd+=' and '
-	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
-	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
-}
diff --git a/dev-ruby/rbpdf/rbpdf-1.21.4.ebuild b/dev-ruby/rbpdf/rbpdf-1.21.4-r1.ebuild
index ff308d91c8ac..b53a4f6468f2 100644
--- a/dev-ruby/rbpdf/rbpdf-1.21.4.ebuild
+++ b/dev-ruby/rbpdf/rbpdf-1.21.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 dev-ruby/webrick )"
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-3 )"
 ruby_add_rdepend "
 	dev-ruby/actionview
 	dev-ruby/htmlentities
@@ -44,19 +44,32 @@ BDEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png] )"
 all_ruby_prepare() {
 	default
 
-	# This test is enabled automagically in the presence of rmagick, and
-	# then fails.
+	# Not worth the additional webrick dependency
+	rm -f test/rbpdf_http_test.rb \
+		|| die "failed to remove http tests"
+
+	# This test is enabled automagically in the presence of rmagick and
+	# fails.
 	rm -f test/rbpdf_image_rmagick_test.rb \
 		|| die "failed to remove rmagick tests"
 }
 
 each_ruby_test() {
-	local cmd='gem "test-unit", ">= 3.0"'
-	cmd+=' and '
-	cmd+='gem "mini_magick", "~>5.0"'
-	cmd+=' and '
-	cmd+='require "test/unit"'
-	cmd+=' and '
-	cmd+='Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}'
-	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
+	# WARNING: The "gem" statements in this script may need to be
+	# updated along with [BR]DEPEND.
+	cat <<- EOF > "${T}/run-tests.rb" || die "test script cat failed"
+	require "rubygems/errors"
+
+	gem "test-unit", ">= 3.0"
+	begin
+	  gem "mini_magick", "~> 5.0"
+	rescue LoadError
+	  gem "rmagick"
+	end
+
+	require "test/unit"
+
+	Dir["test/rbpdf_*.rb"].each{|f| require("./" +  f)}
+	EOF
+	${RUBY} -Ilib:.:test "${T}/run-tests.rb" || die "test suite failed"
 }