[arch-commits] Commit in facter/trunk (FindRuby-2.7.patch PKGBUILD)

[Tim Meusel]

    Date: Friday, September 17, 2021 @ 12:10:26
  Author: bastelfreak
Revision: 1016758

Update 3.14.18->3.14.19; build against ruby3

Modified:
  facter/trunk/PKGBUILD
Deleted:
  facter/trunk/FindRuby-2.7.patch

--------------------+
 FindRuby-2.7.patch |   13 -------------
 PKGBUILD           |   18 +++++++-----------
 2 files changed, 7 insertions(+), 24 deletions(-)

Deleted: FindRuby-2.7.patch
===================================================================
--- FindRuby-2.7.patch	2021-09-17 12:04:14 UTC (rev 1016757)
+++ FindRuby-2.7.patch	2021-09-17 12:10:26 UTC (rev 1016758)
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
-index 4f57d619e..075ab52fe 100644
---- a/cmake/FindRuby.cmake
-+++ b/cmake/FindRuby.cmake
-@@ -55,7 +55,7 @@
- 
- # Determine the list of possible names of the ruby executable depending
- # on which version of ruby is required
--set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
-+set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby-2.7)
- 
- # if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
- if(DEFINED Ruby_FIND_VERSION_MAJOR AND DEFINED Ruby_FIND_VERSION_MINOR)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-17 12:04:14 UTC (rev 1016757)
+++ PKGBUILD	2021-09-17 12:10:26 UTC (rev 1016758)
@@ -9,7 +9,7 @@
 # Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
 
 pkgname=facter
-pkgver=3.14.18
+pkgver=3.14.19
 pkgrel=1
 pkgdesc="Collect and display system facts"
 arch=('x86_64')
@@ -18,11 +18,11 @@
 depends=('yaml-cpp' 'boost-libs' 'curl' 'libwhereami' 'libwhereami.so' 'cpp-hocon' 'libcpp-hocon.so'
          'systemd-libs' 'leatherman' 'leatherman_curl.so' 'leatherman_ruby.so' 'leatherman_execution.so'
          'leatherman_file_util.so' 'leatherman_util.so' 'leatherman_logging.so' 'leatherman_locale.so'
-         'openssl' 'gcc-libs' 'glibc' 'util-linux-libs' 'ruby2.7' 'libblkid.so' 'yaml-cpp')
+         'openssl' 'gcc-libs' 'glibc' 'util-linux-libs' 'ruby' 'libblkid.so' 'yaml-cpp')
 makedepends=('boost' 'cmake' 'java-environment>=10' 'python' 'rapidjson')
-checkdepends=('ruby27-rake' 'ruby27-diff-lcs' 'ruby27-mocha' 'ruby27-rspec-support'
-              'ruby27-rspec-core' 'ruby27-rspec-expectations' 'ruby27-rspec-mocks'
-              'ruby27-rspec')
+checkdepends=('ruby-rake' 'ruby-diff-lcs' 'ruby-mocha' 'ruby-rspec-support'
+              'ruby-rspec-core' 'ruby-rspec-expectations' 'ruby-rspec-mocks'
+              'ruby-rspec')
 optdepends=('java-runtime>=8: jruby support'
             'puppet: retrieve puppet facts')
 replaces=('cfacter')
@@ -32,16 +32,14 @@
         'shared_cpp_hcon.patch'
         'rapidjson-1.1-compat.patch'
         'workaround-broken-double-test.patch'
-        'FindRuby-2.7.patch'
         'azure_rapidjson_fix.patch')
 validpgpkeys=('D6811ED3ADEEB8441AF5AA8F4528B6CD9E61EF26') # "Puppet, Inc. Release Key (Puppet, Inc. Release Key) <release at puppet.com>"
-sha512sums=('9cdc7b544c5858ad3b07e78cd8e827cc8edb5c5c2f1f18cd63c184638a98568e145956470e72ab7841f1228d272729ed1f2c546b4e1de01103ea582f1a130bd2'
+sha512sums=('9ea3710be1cfa0a4819a1f7c2fd302b2f18081cc456cf40e43416a713c696e427161ff4e2bc190ef2ec24d091f2881097c5051280d5020ceacddc5b667a597fd'
             'SKIP'
             '1f5d2595cd6b2a63fc01c92c84eccf8f92bd9e9f0721ea1a3f59836d7d02f5ec6e6e3711b223b240d46ca55f7377f27339b7458c12d6c21564a2764c76df12b2'
             '15fdfb75bb1045e160c095b62025f10d0a04c167223340072a9b8d065a2a185e942d299f86c80449661f37be5e1807efb49e77def44b8de4a9a9f7c2cc111e1a'
             'a1fb08be2c6c9b2a4085404f1d13b13c9d41e3c1a38d35cbad1d29bbd497380492dab368a0fa7288d141f7f94ff7a7a0ae5ce271119e7074e039868682cc766f'
             '335c6db6a4953cf3678877ba81506c475d93f461ec2ee75c22fba4a3f938db0bca7f6cf3ee0376eb4c34b43f1f3fb1a35a0a0e64be5a484c344bd689641ddc2b'
-            '84d6f0ac1f4a47269d3e9bb75036b0cf15ce8624ab293355795e8318be4248958a927d31bba182e064fca581edd4ea1e4f1399c77612a9ce6d98c1ec6c06ebeb'
             '8b03cbc74c7672aaa121d279198993a5779bc6ca30a2f03cf75cb371f4b2699476df1422fcbbfe08b6f700ca434ef589b852aa8157dbbbdb6ae4bfe204ac8733')
 
 prepare() {
@@ -66,8 +64,6 @@
   patch -p1 -N -i "${srcdir}/azure_rapidjson_fix.patch"
 
   patch -p1 -N -i "${srcdir}/workaround-broken-double-test.patch"
-  # build against Ruby-2.7 and not Ruby
-  patch -p1 -N -i "${srcdir}/FindRuby-2.7.patch"
 }
 
 build() {
@@ -91,7 +87,7 @@
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  local _gemdir="$(gem-2.7 env gemdir)"
+  local _gemdir="$(gem env gemdir)"
 
   make -C build DESTDIR="${pkgdir}" install