From 2e70117de6d57ebbb51a9298b09d63e4bf9f20cd Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Tue, 26 Dec 2023 20:46:25 +0100
Subject: [PATCH] main/ruby-bundler: upgrade to 2.5.3

---
 main/ruby-bundler/APKBUILD       | 12 +++++++-----
 main/ruby-bundler/manpages.patch |  9 +++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/main/ruby-bundler/APKBUILD b/main/ruby-bundler/APKBUILD
index 081f27b4ef5..b290075fa72 100644
--- a/main/ruby-bundler/APKBUILD
+++ b/main/ruby-bundler/APKBUILD
@@ -1,14 +1,17 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ruby-bundler
 _gemname=bundler
-pkgver=2.4.15
+pkgver=2.5.3
 pkgrel=0
 pkgdesc="Manage an application's gem dependencies"
 url="https://bundler.io/"
 arch="noarch"
 license="MIT"
 depends="ruby"
-makedepends="ruby-rake"
+makedepends="
+	ruby-rake
+	ruby-rdoc
+	"
 subpackages="$pkgname-doc"
 source="https://github.com/rubygems/rubygems/archive/bundler-v$pkgver.tar.gz
 	manpages.patch
@@ -17,7 +20,6 @@ builddir="$srcdir/rubygems-bundler-v$pkgver/bundler"
 options="!check"  # tests require deps not available in main repo
 
 build() {
-	rake build_metadata
 	gem build $_gemname.gemspec
 }
 
@@ -46,6 +48,6 @@ package() {
 }
 
 sha512sums="
-82b04e37388ec781ec61e1eb0950cbc989c4598e029266c018508da93ceb559be766f81eef9b97f0af302bb6cf9495c2e92d02471436c893d1011644064ee663  bundler-v2.4.15.tar.gz
-77a36e61ed205aeea6114b1039dfbe29fcaf916eeae3f91785aa53b3ac534e004aa257e218534d927f39e3673eebbfb3ef9ee17f04ed81f74117799b88e53cf4  manpages.patch
+571d080e43b7addb8c87769863af1146ab37db4f1adfdc1ee25119172f2db238fc1f78dc2632d0f2da3e5a1b67d63a150af3bfbf496fd9314a0f17b57ac7489e  bundler-v2.5.3.tar.gz
+76c008a71af25db5dda7055c98330fcb864fe7ffb4a5de34a0ad2bea403b28e0d945faf05685abf525b98c67c305068808fc596882676bbb1eb418d83377db41  manpages.patch
 "
diff --git a/main/ruby-bundler/manpages.patch b/main/ruby-bundler/manpages.patch
index cc11b026997..338f93c179c 100644
--- a/main/ruby-bundler/manpages.patch
+++ b/main/ruby-bundler/manpages.patch
@@ -12,7 +12,7 @@ Subject: [PATCH] Fix --help when man pages are moved out
 
 --- a/lib/bundler/cli.rb
 +++ b/lib/bundler/cli.rb
-@@ -118,16 +118,17 @@
+@@ -121,16 +121,18 @@
        end
  
        man_path = File.expand_path("man", __dir__)
@@ -23,11 +23,12 @@ Subject: [PATCH] Fix --help when man pages are moved out
 +        [File.basename(man_name, ".*"), man_name]
        end]
  
++
        if man_pages.include?(command)
          man_page = man_pages[command]
--        if Bundler.which("man") && man_path !~ %r{^file:/.+!/META-INF/jruby.home/.+}
--          Kernel.exec "man #{man_page}"
-+        if Bundler.which("man") && Kernel.system("man -w #{command} >/dev/null 2>&1") && man_path !~ %r{^file:/.+!/META-INF/jruby.home/.+}
+-        if Bundler.which("man") && !man_path.match?(%r{^file:/.+!/META-INF/jruby.home/.+})
+-          Kernel.exec("man", man_page)
++        if Bundler.which("man") && Kernel.system("man -w #{command} >/dev/null 2>&1") && !man_path.match?(%r{^file:/.+!/META-INF/jruby.home/.+})
 +          Kernel.exec "man -c #{command}"
          else
 -          puts File.read("#{man_path}/#{File.basename(man_page)}.ronn")