[arch-commits] Commit in puppet/trunk (PKGBUILD)

[Tim Meusel]

    Date: Sunday, May 16, 2021 @ 16:16:10
  Author: bastelfreak
Revision: 935888

update to 6.22.1; build against ruby2.7

Modified:
  puppet/trunk/PKGBUILD

----------+
 PKGBUILD |   47 ++++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-16 16:14:45 UTC (rev 935887)
+++ PKGBUILD	2021-05-16 16:16:10 UTC (rev 935888)
@@ -1,4 +1,5 @@
-# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
+# Maintainer: Tim Meusel <tim at bastelfreak.de>
+# Contributor: Christian Rebischke <chris.rebischke at archlinux.org>
 # Contributor: Jonathan Steel <jsteel at archlinux.org>
 # Contributor: Greg Sutcliffe <puppet-aur (at) emeraldreverie (dot) org>
 # Contributor: Hyacinthe Cartiaux <hyacinthe (dot) cartiaux (at) free (dot) fr>
@@ -10,27 +11,27 @@
 # Contributor: Tim Meusel <tim (at) bastelfreak (dot) de>
 
 pkgname=puppet
-pkgver=6.21.1
-pkgrel=2
-pkgdesc="Server automation framework and application"
+pkgver=6.22.1
+pkgrel=1
+pkgdesc='Server automation framework and application'
 arch=('any')
-url="https://puppet.com/products/open-source-projects"
+url='https://puppet.com/products/open-source-projects'
 license=('Apache')
-depends=('ruby' 'facter' 'hiera' 'ruby-semantic_puppet' 'ruby-augeas'
-'ruby-shadow' 'ruby-concurrent' 'ruby-multi_json' 'ruby-puppet-resource_api'
-'ruby-httpclient' 'ruby-deep_merge' 'ruby-sync')
-makedepends=('git' 'ruby-rake')
-checkdepends=('ruby-rspec' 'ruby-yard')
+depends=('ruby2.7' 'facter' 'hiera' 'ruby27-semantic_puppet' 'ruby27-augeas'
+'ruby27-shadow' 'ruby27-concurrent' 'ruby27-multi_json' 'ruby27-puppet-resource_api'
+'ruby27-httpclient' 'ruby27-deep_merge' 'ruby27-sync')
+makedepends=('git' 'ruby27-rake')
+#checkdepends=('ruby-rspec' 'ruby-yard')
 backup=('etc/puppetlabs/puppet/auth.conf'
         'etc/puppetlabs/puppet/puppet.conf'
         'etc/puppetlabs/puppet/hiera.yaml')
 install="$pkgname.install"
 
-_augeas_commit=0cf6c355071c965f56b84fd7012f8f6b282a982a
+_augeas_commit=8e2d9aa99f43941a37cdd08e191efb6d5bba154a
 _cron_commit=b4e1054fdc2f819b6f45821afe954e7b24620958
 _host_commit=34dca65fe54ba08bd764691e2619371c213df70b
 _mount_commit=1e56e2588058551360269472823bf3426c5e1900
-_selinux_commit=cfa0d78156c507f1e95a4fbd91bd5a7b0c2a2ddc
+_selinux_commit=d07dfb309c575a0528396f16673780ec9d4a39d4
 _sshkeys_commit=313a6cfa7580141a8e9a1c07c187b9ad7643435e
 _yumrepo_commit=4bf78c89309e2539342aaed5b9c92ea6a0a96281
 _zfs_commit=04da7f3099541216600167587d4b1dd82144b038
@@ -46,9 +47,8 @@
         "yumrepo_core::git+https://github.com/puppetlabs/puppetlabs-yumrepo_core#commit=${_yumrepo_commit}"
         "zfs_core::git+https://github.com/puppetlabs/puppetlabs-zfs_core#commit=${_zfs_commit}"
         "zone_core::git+https://github.com/puppetlabs/puppetlabs-zone_core#commit=${_zone_commit}"
-	"ruby30.patch"
         )
-sha512sums=('f62cfbd78412a9b4379c9f2e2a1cd3126faf5caddc444396d20f2e3f97b35d04960dfa258b9f66aee404e17d0e7ed2ff72bf1d0d1031a84a90d0dcc9ca07575e'
+sha512sums=('b69622141546d14a600d69fb04ed91ddc9aeee4f8ff25c979b5f640aed16c271d25ce8abb7e6408fa55f7d8a09321ef68355e12088c629c7b3f8a721cdaa8b37'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -57,8 +57,7 @@
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            '09e1732fc8b38f3c5061cc85e620ee1af9e558b44900f1c6e2064dc0b5b8980c6c10f21cfc21dafb6d2eb9fa05942c7655e45df7352ffce379a407c92cb34147')
+            'SKIP')
 conflicts=('puppet5')
 provides=('puppet')
 
@@ -67,8 +66,6 @@
 
   # FS#45044: fix file location
   sed -i 's_/opt/puppetlabs/puppet_/usr_' ext/systemd/puppet.service
-
-  patch -p1 < ../ruby30.patch
 }
 
 check() {
@@ -84,7 +81,7 @@
 package() {
   cd $pkgname-$pkgver
 
-  local _gemdir="$(gem env gemdir)"
+  local _gemdir="$(gem-2.7 env gemdir)"
 
   # install the gemspec file
   # this allows other gems to load puppet as a library (for example puppet-strings)
@@ -93,19 +90,15 @@
   # generate manpages | this breaks right now..
   #rake gen_manpages
 
-  ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e \
-    'puts RbConfig::CONFIG["vendorlibdir"]' )"
+  ruby-2.7 install.rb --destdir="$pkgdir" --sitelibdir="$( ruby-2.7 -e 'puts RbConfig::CONFIG["vendorlibdir"]' )"
 
   install -d "$pkgdir"/usr/lib/{sysusers.d,tmpfiles.d}
 
-  echo 'u puppet 52 "Puppet" /var/lib/puppet' > \
-    "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf
-  echo "d /run/puppetlabs 0755 $pkgname $pkgname -" > \
-    "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
+  echo 'u puppet 52 "Puppet" /var/lib/puppet' > "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf
+  echo "d /run/puppetlabs 0755 $pkgname $pkgname -" > "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf
 
   # systemd
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/systemd/$pkgname.service \
-    "$pkgdir"/usr/lib/systemd/system/$pkgname.service
+  install -Dm644 "$srcdir"/$pkgname-$pkgver/ext/systemd/$pkgname.service "$pkgdir"/usr/lib/systemd/system/$pkgname.service
 
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE