[arch-commits] Commit in r10k/repos/community-any (PKGBUILD PKGBUILD ruby3.patch)

[Tim Meusel]

    Date: Tuesday, October 26, 2021 @ 17:53:25
  Author: bastelfreak
Revision: 1034217

archrelease: copy trunk to community-any

Added:
  r10k/repos/community-any/PKGBUILD
    (from rev 1034216, r10k/trunk/PKGBUILD)
Deleted:
  r10k/repos/community-any/PKGBUILD
  r10k/repos/community-any/ruby3.patch

-------------+
 PKGBUILD    |  115 +++++++++++++++++++++++++++-------------------------------
 ruby3.patch |   16 --------
 2 files changed, 55 insertions(+), 76 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-26 17:53:19 UTC (rev 1034216)
+++ PKGBUILD	2021-10-26 17:53:25 UTC (rev 1034217)
@@ -1,60 +0,0 @@
-# Maintainer: Tim Meusel <tim at bastelfreak.de>
-# Contributor: arakmar
-pkgname=r10k
-pkgver=3.12.1
-pkgrel=1
-pkgdesc='Provides a general purpose toolset for deploying Puppet environments and modules.'
-arch=('any')
-url="https://github.com/puppetlabs/${pkgname}"
-license=('Apache')
-depends=('ruby' 'ruby-colored2' 'ruby-cri' 'ruby-gettext-setup' 'ruby-log4r' 'ruby-multi_json' 'ruby-semantic_puppet' 'ruby-puppet_forge' 'ruby-rugged' 'ruby-fast_gettext' 'ruby-gettext' 'ruby-faraday' 'ruby-faraday-net_http' 'ruby-jwt')
-makedepends=('ruby-minitar' 'ruby-yard')
-checkdepends=('ruby-rspec')
-source=("${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz" 'ruby3.patch')
-sha512sums=('a46e2b49118977ac93e8f832209f4f01c0ca3b6b293ffd232daf6370473f2dc268d9eed44c1a82d38eca428ececee4d7c299c6b129ee1249075636e24d647f6c'
-            '8bff35f0a42b145105ef492e70e1c62fc41a5309c6c921e96098d7463b4a53f3f5d97d7cc4bd87ef8f1fd26345c2faefcd4f5046e5c84eee8c98f6c4ca089576')
-options=('!emptydirs')
-
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # update the gemspec to allow newer versions
-  sed --in-place 's|~>|>=|g' "${pkgname}.gemspec"
-  # don't use git to detect files for the package
-  sed --in-place 's|git ls-files|find|g' "${pkgname}.gemspec"
-  # allow newer gettext versions
-  sed --in-place 's|< 3.3.0|< 4.0.0|' "${pkgname}.gemspec"
-  # allow newer version of cri
-  sed --in-place "s#, '2.15.10'##" r10k.gemspec
-  # drop dev/CI dependencies; they only create package dependecy circles
-  sed --in-place '/add_development_dependency/d' "${pkgname}.gemspec"
-
-  # Workaround broken Ruby 3 support
-  # https://github.com/puppetlabs/r10k/pull/1234
-  patch -p1 -N -i "${srcdir}/ruby3.patch"
-}
-
-build() {
-  cd "${pkgname}-${pkgver}"
-  gem build "${pkgname}.gemspec"
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  rspec --color --format documentation spec/unit
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  local _gemdir="$(gem env gemdir)"
-  gem install --verbose --ignore-dependencies --no-user-install --install-dir "${pkgdir}/${_gemdir}" --bindir "${pkgdir}/usr/bin" "${pkgname}-${pkgver}.gem"
-
-  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
-  install -Dm 644 r10k.yaml.example CHANGELOG.mkd README.mkd CONTRIBUTING.mkd -t "${pkgdir}/usr/share/doc/${pkgname}"
-  mv doc docker integration "${pkgdir}/usr/share/doc/${pkgname}/"
-
-  rm -rf "${pkgdir}/${_gemdir}/gems/${pkgname}-${pkgver}/ext"
-  rm -rf "${pkgdir}/${_gemdir}/cache"
-}
-
-# vim: ts=2 sw=2 et:

Copied: r10k/repos/community-any/PKGBUILD (from rev 1034216, r10k/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-10-26 17:53:25 UTC (rev 1034217)
@@ -0,0 +1,55 @@
+# Maintainer: Tim Meusel <tim at bastelfreak.de>
+# Contributor: arakmar
+pkgname=r10k
+pkgver=3.13.0
+pkgrel=1
+pkgdesc='Provides a general purpose toolset for deploying Puppet environments and modules.'
+arch=('any')
+url="https://github.com/puppetlabs/${pkgname}"
+license=('Apache')
+depends=('ruby' 'ruby-colored2' 'ruby-cri' 'ruby-gettext-setup' 'ruby-log4r' 'ruby-multi_json' 'ruby-semantic_puppet' 'ruby-puppet_forge' 'ruby-rugged' 'ruby-fast_gettext' 'ruby-gettext' 'ruby-faraday' 'ruby-faraday-net_http' 'ruby-jwt')
+makedepends=('ruby-minitar' 'ruby-yard')
+checkdepends=('ruby-rspec')
+source=("${url}/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha512sums=('407d53aa122defccc22c92bcafef59cdb4b809051f688cb3b1cc29b44ab79f8786789e1a32865fe6eee69e6b5cda31375a891ad65fad96ea6808d0b77cc4d60a')
+options=('!emptydirs')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # update the gemspec to allow newer versions
+  sed --in-place 's|~>|>=|g' "${pkgname}.gemspec"
+  # don't use git to detect files for the package
+  sed --in-place 's|git ls-files|find|g' "${pkgname}.gemspec"
+  # allow newer gettext versions
+  sed --in-place 's|< 3.3.0|< 4.0.0|' "${pkgname}.gemspec"
+  # allow newer version of cri
+  sed --in-place "s#, '2.15.10'##" r10k.gemspec
+  # drop dev/CI dependencies; they only create package dependecy circles
+  sed --in-place '/add_development_dependency/d' "${pkgname}.gemspec"
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+  gem build "${pkgname}.gemspec"
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  rspec --color --format documentation spec/unit
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  local _gemdir="$(gem env gemdir)"
+  gem install --verbose --ignore-dependencies --no-user-install --install-dir "${pkgdir}/${_gemdir}" --bindir "${pkgdir}/usr/bin" "${pkgname}-${pkgver}.gem"
+
+  install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -Dm 644 r10k.yaml.example CHANGELOG.mkd README.mkd CONTRIBUTING.mkd -t "${pkgdir}/usr/share/doc/${pkgname}"
+  mv doc docker integration "${pkgdir}/usr/share/doc/${pkgname}/"
+
+  rm -rf "${pkgdir}/${_gemdir}/gems/${pkgname}-${pkgver}/ext"
+  rm -rf "${pkgdir}/${_gemdir}/cache"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: ruby3.patch
===================================================================
--- ruby3.patch	2021-10-26 17:53:19 UTC (rev 1034216)
+++ ruby3.patch	2021-10-26 17:53:25 UTC (rev 1034217)
@@ -1,16 +0,0 @@
-diff --git a/spec/unit/action/puppetfile/install_spec.rb b/spec/unit/action/puppetfile/install_spec.rb
-index 8604af28..0a3cd565 100644
---- a/spec/unit/action/puppetfile/install_spec.rb
-+++ b/spec/unit/action/puppetfile/install_spec.rb
-@@ -4,9 +4,9 @@ require 'r10k/action/puppetfile/install'
- describe R10K::Action::Puppetfile::Install do
-   let(:default_opts) { { root: "/some/nonexistent/path" } }
-   let(:loader) {
--    R10K::ModuleLoader::Puppetfile.new({
-+    R10K::ModuleLoader::Puppetfile.new(
-       basedir: '/some/nonexistent/path',
--      overrides: {force: false}})
-+      overrides: {force: false})
-   }
- 
-   def installer(opts = {}, argv = [], settings = {})