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

[Tim Meusel]

    Date: Tuesday, September 14, 2021 @ 20:07:41
  Author: bastelfreak
Revision: 1014861

update puppet 6->7.10

Modified:
  puppet/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-09-14 20:03:19 UTC (rev 1014860)
+++ PKGBUILD	2021-09-14 20:07:41 UTC (rev 1014861)
@@ -10,17 +10,15 @@
 # Contributor: Niels Abspoel <aboe76 (at) Gmail (dot) com>
 
 pkgname=puppet
-pkgver=6.23.0
+pkgver=7.10.0
 pkgrel=1
 pkgdesc='Server automation framework and application'
 arch=('any')
 url='https://puppet.com/products/open-source-projects'
 license=('Apache')
-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')
+depends=(ruby facter ruby-semantic_puppet ruby-augeas ruby-shadow ruby-concurrent ruby-multi_json ruby-puppet-resource_api ruby-deep_merge ruby-fast_gettext hiera ruby-locale ruby-scanf)
+makedepends=('git' 'rake' 'ruby-rdoc')
+checkdepends=('ruby-rspec' 'ruby-yard' 'ruby-rspec-its' 'ruby-webmock')
 backup=('etc/puppetlabs/puppet/auth.conf'
         'etc/puppetlabs/puppet/puppet.conf'
         'etc/puppetlabs/puppet/hiera.yaml')
@@ -47,7 +45,7 @@
         "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}"
         )
-sha512sums=('229dbf63df563aa2aefd31524e9cf02c5107cae68abd0b0dafdf2272aa847cfd22391bc8927008f868e7fb4805608ef2a17a512f86b9f143a66c7ce459e27a2a'
+sha512sums=('787f17cd2d8b5d04da29c24d5120905ac2758a8e65b87a3cf4f6367f124530966d76f2ad0e7448f5cc7cf633b12aa487b3510012ca7a688187b146b6350f657d'
             'SKIP'
             'SKIP'
             'SKIP'
@@ -57,7 +55,7 @@
             'SKIP'
             'SKIP'
             'SKIP')
-conflicts=('puppet5')
+conflicts=('puppet5' 'puppet6')
 provides=('puppet')
 
 prepare() {
@@ -70,7 +68,7 @@
 check() {
   cd "${pkgname}-${pkgver}"
   # This breaks right now due to missing dependencies
-  #rake --tasks              # show all tasks
+  #rake --tasks             # show all tasks
   #rake commits             # requires a git repo
   #rake warnings            # requires a git repo
   #rake spec                # run tests single threaded
@@ -78,9 +76,9 @@
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd "${pkgname}-${pkgver}"
 
-  local _gemdir="$(gem-2.7 env gemdir)"
+  local _gemdir="$(gem env gemdir)"
 
   # install the gemspec file
   # this allows other gems to load puppet as a library (for example puppet-strings)
@@ -89,7 +87,7 @@
   # generate manpages | this breaks right now..
   #rake gen_manpages
 
-  ruby-2.7 install.rb --destdir="$pkgdir" --sitelibdir="$( ruby-2.7 -e 'puts RbConfig::CONFIG["vendorlibdir"]' )"
+  ruby install.rb --destdir="$pkgdir" --sitelibdir="$( ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]' )"
 
   install -d "$pkgdir"/usr/lib/{sysusers.d,tmpfiles.d}