[arch-commits] Commit in hiera/trunk (PKGBUILD ruby3.patch)

[Anatol Pomozov]

    Date: Friday, March 19, 2021 @ 18:41:57
  Author: anatolik
Revision: 894859

ruby3 patch for install.rb

Added:
  hiera/trunk/ruby3.patch
Modified:
  hiera/trunk/PKGBUILD

-------------+
 PKGBUILD    |   11 +++++++++--
 ruby3.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-19 18:28:56 UTC (rev 894858)
+++ PKGBUILD	2021-03-19 18:41:57 UTC (rev 894859)
@@ -9,9 +9,16 @@
 license=('APACHE')
 depends=('ruby')
 backup=('etc/hiera.yaml')
-source=("${pkgname}-${pkgver}.tar.gz::https://downloads.puppetlabs.com/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('e9819d0b166acca73321b6b6c23c404f2b03203d6fa934859918d47ec4ca6d234acff0c9f02012f756f239a719c00be4b48afb5b34b88069be2e67055a8f48e3')
+source=("${pkgname}-${pkgver}.tar.gz::https://downloads.puppetlabs.com/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        ruby3.patch)
+sha512sums=('e9819d0b166acca73321b6b6c23c404f2b03203d6fa934859918d47ec4ca6d234acff0c9f02012f756f239a719c00be4b48afb5b34b88069be2e67055a8f48e3'
+            '4e55027f5c21872eb55ae80656c3039a92717d2619cbeef1a86c8d5f938727b3f9ff68bdceb71b3198597bcd5cb981a8b3b07528003364041ef387376d80d275')
 
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  patch -p1 < ../ruby3.patch
+}
+
 package() {
   cd "${pkgname}-${pkgver}"
   ruby install.rb --destdir="${pkgdir}" --sitelibdir="$(ruby -e \

Added: ruby3.patch
===================================================================
--- ruby3.patch	                        (rev 0)
+++ ruby3.patch	2021-03-19 18:41:57 UTC (rev 894859)
@@ -0,0 +1,43 @@
+commit af4b70b6b9ed4d22a277402939fccf6e2e9d82e9
+Author: Anatol Pomozov <anatol.pomozov at gmail.com>
+Date:   Fri Mar 19 11:36:30 2021 -0700
+
+    Fileutils::install accepts keyword arguments
+
+diff --git a/install.rb b/install.rb
+index a13cded..8c7890d 100755
+--- a/install.rb
++++ b/install.rb
+@@ -51,7 +51,7 @@ def do_configs(configs, target, strip = 'ext/')
+   Dir.mkdir(target) unless File.directory? target
+   configs.each do |cf|
+     ocf = File.join(InstallOptions.config_dir, cf.gsub(/#{strip}/, ''))
+-    install(cf, ocf, {:mode => 0644, :preserve => true, :verbose => true})
++    install(cf, ocf, :mode => 0644, :preserve => true, :verbose => true)
+   end
+ end
+ 
+@@ -67,9 +67,9 @@ def do_libs(libs, strip = 'lib/')
+   libs.each do |lf|
+     olf = File.join(InstallOptions.site_dir, lf.gsub(/#{strip}/, ''))
+     op = File.dirname(olf)
+-    makedirs(op, {:mode => 0755, :verbose => true})
++    makedirs(op, :mode => 0755, :verbose => true)
+     chmod(0755, op)
+-    install(lf, olf, {:mode => 0644, :preserve => true, :verbose => true})
++    install(lf, olf, :mode => 0644, :preserve => true, :verbose => true)
+   end
+ end
+ 
+@@ -77,9 +77,9 @@ def do_man(man, strip = 'man/')
+   man.each do |mf|
+     omf = File.join(InstallOptions.man_dir, mf.gsub(/#{strip}/, ''))
+     om = File.dirname(omf)
+-    makedirs(om, {:mode => 0755, :verbose => true})
++    makedirs(om, :mode => 0755, :verbose => true)
+     chmod(0755, om)
+-    install(mf, omf, {:mode => 0644, :preserve => true, :verbose => true})
++    install(mf, omf, :mode => 0644, :preserve => true, :verbose => true)
+ 
+     gzip = %x{which gzip}
+     gzip.chomp!