5 files changed, 44 insertions, 31 deletions
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 3984a20141b1..d1098afbe733 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,4 +1,3 @@
-DIST pkg-config-1.5.1.gem 23040 BLAKE2B c814cabb2a57f9a40cd5b8112f0103a9aa7a4aeb10f2991ff23a846a98714d832c77ecb9bec9b3c884adf98496eb552451a6b98875a78921efdac229fc5a5e39 SHA512 972fdc1ed64adb66a388331e10c00648560abec8455727b804cb2fe9ce40dd9801dfc909116c1cc96b8617aa52873339a290c5d0775a88c30f2399566db557e6
 DIST pkg-config-1.5.2.gem 23040 BLAKE2B 32670e823980888b3cc679afa61cb71092b559ad12ab0cd4485ccc191353426af23f0007fd844cc8a71ad7c4c1c190587eb7643f19f68623ecad182270606141 SHA512 f4aa101ff6bbfce5bf23b6c83f61e186424c097f889e51fe337d158753fc8af26ee918bb509653ea70487a7d92a24b66cc96c1c0ea4bed2cfab5cd9380317679
-DIST pkg-config-1.5.3.gem 23040 BLAKE2B bd629261c226c7d4f108a73e53fbc5b2c1d1828d52836c1873bcc5a7c7776109b4cdc67568667cb4b0e1666432fbcaf20b4e02b41958a562de5a79c854aa22ec SHA512 06b29f5db397090c37a38f2f9b9d7cd6a1f0d11ea0d76c817f7a377f8e02d056863ebbcd04642f6d561b37b7ade5a226b68af16993e013d13e7830ffa902397d
 DIST pkg-config-1.5.5.gem 23040 BLAKE2B c23e7904d9a9630d684bbfb0ac85893d5539c3eff7f5a12ca8703095ec076415ff938c9e0d74e873a5a31581c3f28a60bfd65df1466bae2a109259748a921b69 SHA512 d796999a6a1745ddbd9b816d8d7ba714097538803f85864b41745c48730a6fa27ced405837500e6d35edc9dad432e86da0d8e788fd18e8b9d507fa0ac0fb7b81
+DIST pkg-config-1.5.6.gem 23040 BLAKE2B dad69e21b43fd8b97ea0f01973b89bf5182664b4170fcff7aacb40db045da313579920750450e1b2fa90a955d4c9a64b8eb9bb5618d2728db1114f4e9e173354 SHA512 cff5b2e3ed19ea6f8ea554990ba51a6313a663a258d9962c951ae75016fd181bc35593a871086c7f1fa4347e3f15949ad1621ea8fa86ca0d330db19c84a80ee4
diff --git a/dev-ruby/pkg-config/pkg-config-1.5.1.ebuild b/dev-ruby/pkg-config/pkg-config-1.5.1.ebuild
deleted file mode 100644
index ac313afa6d2c..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.5.1.ebuild
+++ /dev/null
@@ -1,29 +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_EXTRADOC="README.rdoc NEWS"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/ruby-gnome/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-all_ruby_prepare() {
-	sed -e '/test_cflags/aomit "Fragile on Gentoo"' -i test/test-pkg-config.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test-pkg-config.rb || die
-}
diff --git a/dev-ruby/pkg-config/pkg-config-1.5.3.ebuild b/dev-ruby/pkg-config/pkg-config-1.5.6.ebuild
index 846afc769643..846afc769643 100644
--- a/dev-ruby/pkg-config/pkg-config-1.5.3.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.5.6.ebuild
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index b253c3c12af9..c52cbc84813c 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,2 +1,3 @@
 DIST sshkit-1.21.4.gem 144896 BLAKE2B a4f7cd2342810422c6dd680370c741136bbe1cc59656333bb8a82ac2edd6eb0e3d5482cf671a3ffdcc38cd2f2a97140623728e213e8fd3098b223b9e601e6ea1 SHA512 c3a56b7dd80334b87d512054e98e8a72d93b036a4fb0adc34fad259c5b851de6a3c69549d1472442a3b822d371e80115849aa767dd7fda215fd0f626a7138173
 DIST sshkit-1.21.5.gem 145408 BLAKE2B 19fa326d30ddae12be84b7cf460d5d44c48fc52cf89f61a775999eae7cbcc985ac7b335dd4aa772e8966decc24a6e5a894621e9873ac133122fb8e18d1c82945 SHA512 e441da155323dd71c235d3ebb4ddccd41987183cffe4e23cb52404ba25a16ae4f3c1f786d7be4db6dc8733013720b99d12c8f3369f1d8841f967407b3edb28b2
+DIST sshkit-1.21.6.gem 145408 BLAKE2B 2196d0d8959a38d10e40de6c758c9cf3d64c9622de1dd0825a74435c45666450a554045172bcc1a1cbac33edcf962e93ad07a992d52bf946e3a060606c145e09 SHA512 8f6db82cd3607e947b6fd7ad0c5010b631254bcd12c19489e8446d83b352f9333baf9ed77aa197a4f0a081f75363404f5e48289f2d1f701c1a23cd834cca0ac4
diff --git a/dev-ruby/sshkit/sshkit-1.21.6.ebuild b/dev-ruby/sshkit/sshkit-1.21.6.ebuild
new file mode 100644
index 000000000000..041881f1d983
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.21.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/net-ssh-2.8.0:*
+	>=dev-ruby/net-scp-1.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+	sed -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+		-e '1irequire "pathname"' \
+		-i test/helper.rb || die
+
+	# Fix assumption about parent directory name
+	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+	# Run tests directly to avoid dependencies in the Rakefile
+	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
+}