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

[David Runge]

    Date: Thursday, January 27, 2022 @ 22:25:36
  Author: dvzrv
Revision: 1117930

upgpkg: ruby-i18n 1.9.0-2: Rebuild to fix dependencies of package.

Use ruby-{activesupport,json,mocha} only in checkdepends.
Remove patch to remove pry from Gemfile and remove Gemfile instead.
https://github.com/ruby-i18n/i18n/issues/607

Modified:
  ruby-i18n/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-27 22:24:59 UTC (rev 1117929)
+++ PKGBUILD	2022-01-27 22:25:36 UTC (rev 1117930)
@@ -3,26 +3,23 @@
 _name=i18n
 pkgname=ruby-i18n
 pkgver=1.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="New wave internationalisation support for Ruby"
 arch=(any)
 url="https://github.com/ruby-i18n/i18n"
 license=(MIT)
-depends=(ruby ruby-activesupport ruby-concurrent ruby-json ruby-mocha)
-makedepends=(ruby-bundler ruby-rake ruby-rdoc)
-checkdepends=(ruby-minitest ruby-test_declarative)
+depends=(ruby ruby-concurrent)
+makedepends=(ruby-rdoc)
+checkdepends=(ruby-bundler ruby-activesupport ruby-json ruby-minitest ruby-mocha ruby-rake ruby-test_declarative)
 options=(!emptydirs)
 source=(
   "${pkgname}-${pkgver}.tar.gz::https://github.com/ruby-i18n/${_name}/archive/v${pkgver}.tar.gz"
   "${pkgname}-1.9.0-broken_imports.patch::https://github.com/ruby-i18n/i18n/pull/602/commits/813124cd3cd889578cfe359de6cf46412f1548c9.patch"
-  "${pkgname}-1.9.0-remove_pry.patch::https://github.com/ruby-i18n/i18n/pull/608/commits/bd48ee07e939d903fcc52d8aa813654c457aed73.patch"
 )
 sha512sums=('3fb0f157d64312c518c986d9b462e73e30bdb9e639672c92a7bab6e68cb3e9b5dd490ed3cfd4101eb9bf4903a6d1172ab6fdf4f6ac0bc4ed8b0de505c9bf8291'
-            '810ebe6eab64eb4942506d6f49f85c789f2f13fe2e68ea36e517367e796dd265e405c83ff1abf2279cd50244fb605a9975bc8f780ed8ee09d05a3e1533aae2d1'
-            'fb46c3cc84473f7902dca16c515dd36639456568bfa16fc985444efdb289a62abca7207c36dc4b3c741e51590fa814167fdbb0617b4d32f91acb83b3ad634c8c')
+            '810ebe6eab64eb4942506d6f49f85c789f2f13fe2e68ea36e517367e796dd265e405c83ff1abf2279cd50244fb605a9975bc8f780ed8ee09d05a3e1533aae2d1')
 b2sums=('3f86850655ff8de1090f21c731ba3a37d538112e4ed97d09ae22b7edd20e32d42b1bc6e67e26a0049f1e3acc422c11ffb7be7d48f4b7fc707193e613032fd8ee'
-        '9da69039e81df076fd4968e6efcd85a69449297560ffa93eddd91050d87b484df00c43fcbd8ef6be82382ec0ca61ba6392e7c3231798ae82ff379daba8034f11'
-        '9c17b8ebeba65a629d469626262a20cb4a7c86f6fbce484ce0a381965aa4b94ce55b13507324390e91317a5b2ca83a48bb8376157d82a380175f5a911c0ce2d7')
+        '9da69039e81df076fd4968e6efcd85a69449297560ffa93eddd91050d87b484df00c43fcbd8ef6be82382ec0ca61ba6392e7c3231798ae82ff379daba8034f11')
 
 prepare() {
   cd ${_name}-${pkgver}
@@ -30,11 +27,11 @@
   # remove broken imports: https://github.com/ruby-i18n/i18n/pull/602
   patch -Np1 -i ../${pkgname}-1.9.0-broken_imports.patch
 
-  # remove pry from Gemfile: https://github.com/ruby-i18n/i18n/issues/607
-  patch -Np1 -i ../${pkgname}-1.9.0-remove_pry.patch
+  # we don't do version pinning
+  sed -r 's|~>|>=|g' -i "${_name}.gemspec"
 
-  # we don't do version pinning
-  sed -r 's|~>|>=|g' -i "${_name}.gemspec" Gemfile
+  # we can not rely on Gemfiles as they usually contain all sorts of development dependencies as well
+  rm -v Gemfile
 }
 
 build() {