4 files changed, 36 insertions, 2 deletions
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index b3c53bf7760d..efe8217919c5 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -5,3 +5,4 @@ DIST bundler-2.2.19.gem 390656 BLAKE2B 212e41d2f5f8e9b689265bc0b3294d25c0ffaa681
 DIST bundler-2.2.20.gem 391168 BLAKE2B dc53699a56187fca399216d02de5a669bf6f78301b9095eef2047d353c9ed8b33a83063d2a2afec35c445de3d37ef66451c848909150a1b9802745f6d53bf724 SHA512 2e5e651c2bcfea91f6bde57ae635b62e28bed3f081afde33f77be9adb040aafbe61b48f3e4cd6555bc65ca156bad19d727084d8bd7ce8da130c25ab8de00e090
 DIST bundler-2.2.21.gem 391168 BLAKE2B abed6993e00c4e0ea6e0b7a19dc2b48dfd110e00ad47cca77c66143c61fe8b95ef3b4964c3b0d8ed74ff2e49ec4e3b44876f5a692ad0c16ad5d5b9a5d56578da SHA512 2905afc06402cf3f07da1c622279963b4aa68d6e91f65fd8542434fcc2f7ac820abdb24422523ce1089a234dbce6189dd7bd60e509da97d385824fde8f85b892
 DIST bundler-2.2.24.gem 391168 BLAKE2B 2b70c476d2f0e400f52bf5d6caf2ad06394c3d7bf0f3abc7dd9c3b62cb6c4a1c8621589d908c39f7f434e4b204fc4c63e4f40a88f8dda55e7ba9ecab9785867c SHA512 ac50c7d2bbcfa0903511fd0b9a56ebc6da67b0bd54da67ff2f23bd8a60a90f384b6b231e8ea45588a10758d889e561ed5a12866d879c8f47fc289f0a7e650f3f
+DIST bundler-2.2.25.gem 391168 BLAKE2B 73a5872a978ed85f39e188c31b051776b8364b69d23fcb6e77a97104199aeaf2cf183702a7145d9db7ce29d93d782b29ca9a3da0d925885a2ce21b240bdd0fb2 SHA512 b52d97ef86164e44e9f02b178ecda5934c459258c55bb2e804e1d053818a1283c260e4c35e872b084e43e5f7d8bc71f13df7154d8d279d6f3aafe347514b1474
diff --git a/dev-ruby/bundler/bundler-2.2.25.ebuild b/dev-ruby/bundler/bundler-2.2.25.ebuild
new file mode 100644
index 000000000000..e03102a40889
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.25.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/curb/curb-0.9.11-r1.ebuild b/dev-ruby/curb/curb-0.9.11-r1.ebuild
index bf0097fb81a3..c3928cceda46 100644
--- a/dev-ruby/curb/curb-0.9.11-r1.ebuild
+++ b/dev-ruby/curb/curb-0.9.11-r1.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND+=" net-misc/curl[ssl]"
+DEPEND+=" net-misc/curl[ssl] test? ( net-misc/curl[samba] )"
 RDEPEND+=" net-misc/curl[ssl]"
 
 all_ruby_prepare() {
@@ -39,4 +39,7 @@ all_ruby_prepare() {
 	# avoid failing tests where failure condition seems weird, no
 	# upstream travis so not clear if the test is indeed broken.
 	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
+
+	# avoid test requiring ntlm support on curl which is no longer available in gentoo
+	sed -i -e '/test_username_password/aomit "ntlm support in curl needed"' -i tests/tc_curl_easy.rb || die
 }
diff --git a/dev-ruby/pundit/pundit-2.1.1.ebuild b/dev-ruby/pundit/pundit-2.1.1.ebuild
index aabad7105e01..aa5c64669fdb 100644
--- a/dev-ruby/pundit/pundit-2.1.1.ebuild
+++ b/dev-ruby/pundit/pundit-2.1.1.ebuild
@@ -23,5 +23,5 @@ ruby_add_bdepend "test? ( >=dev-ruby/actionpack-3.0.0
 	>=dev-ruby/activemodel-3.0.0 )"
 
 all_ruby_prepare() {
-	sed -i -e "/pry/d" spec/spec_helper.rb || die
+	sed -i -e "/pry/d" -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
 }