[arch-commits] Commit in vagrant/trunk (PKGBUILD relax_ruby_version.patch)

[Jonathan Steel]

    Date: Sunday, March 21, 2021 @ 08:45:53
  Author: jsteel
Revision: 897210

upgpkg: vagrant 2.2.14-2

Ruby 3.0 rebuild - switch to ruby2.6

Modified:
  vagrant/trunk/PKGBUILD
Deleted:
  vagrant/trunk/relax_ruby_version.patch

--------------------------+
 PKGBUILD                 |   19 ++++++-------------
 relax_ruby_version.patch |   18 ------------------
 2 files changed, 6 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-21 08:44:36 UTC (rev 897209)
+++ PKGBUILD	2021-03-21 08:45:53 UTC (rev 897210)
@@ -10,7 +10,7 @@
 
 pkgname=vagrant
 pkgver=2.2.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Build and distribute virtualized development environments"
 arch=('x86_64')
 url="https://vagrantup.com"
@@ -17,25 +17,18 @@
 license=('MIT')
 options=('!emptydirs')
 depends=('curl' 'libarchive' 'libssh2' 'libxml2' 'libxslt' 'rsync'
-         'ruby' 'xz' 'perl')
+         'ruby2.6' 'xz' 'perl')
 makedepends=('git' 'go')
 conflicts=('vagrant-substrate')
 replaces=('vagrant-substrate')
 source=($pkgname-$pkgver.tar.gz::https://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
-        "git+https://github.com/mitchellh/vagrant-installers.git#commit=4ddca26"
-        relax_ruby_version.patch)
+        "git+https://github.com/mitchellh/vagrant-installers.git#commit=4ddca26")
 md5sums=('fef064ac4c3aa80ce64addcfc4666196'
-         'SKIP'
-         '5a680e21dc1128613fdf0d744cd68d34')
+         'SKIP')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 < ../relax_ruby_version.patch
-}
-
 build() {
   cd $pkgname-$pkgver
-  gem build $pkgname.gemspec
+  gem-2.6 build $pkgname.gemspec
 
 
   export GO111MODULE=off # golang 1.16 uses modules by default and packages below fail to compile
@@ -65,7 +58,7 @@
 
   GEM_PATH="$EMBEDDED_DIR"/gems/$pkgver GEM_HOME="$GEM_PATH" \
   GEMRC="$EMBEDDED_DIR"/etc/gemrc \
-    gem install $pkgname-$pkgver.gem --no-document --prerelease
+    gem-2.6 install $pkgname-$pkgver.gem --no-document --prerelease
 
   install -Dm755 "$INSTALLERS_DIR"/launcher/vagrant \
     "$pkgdir"/opt/$pkgname/bin/$pkgname

Deleted: relax_ruby_version.patch
===================================================================
--- relax_ruby_version.patch	2021-03-21 08:44:36 UTC (rev 897209)
+++ relax_ruby_version.patch	2021-03-21 08:45:53 UTC (rev 897210)
@@ -1,18 +0,0 @@
-commit 2801c182d65204da7af585578f68901f81deb3f9
-Author: Anatol Pomozov <anatol.pomozov at gmail.com>
-Date:   Mon Jun 5 21:54:53 2017 -0700
-
-    Relax ruby version to match Arch Linux version
-
-diff --git a/vagrant.gemspec b/vagrant.gemspec
-index c45607b74..f09e494c4 100644
---- a/vagrant.gemspec
-+++ b/vagrant.gemspec
-@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
-   s.summary       = "Build and distribute virtualized development environments."
-   s.description   = "Vagrant is a tool for building and distributing virtualized development environments."
- 
--  s.required_ruby_version     = "~> 2.5", "< 2.8"
-   s.required_rubygems_version = ">= 1.3.6"
- 
-   s.add_dependency "bcrypt_pbkdf", "~> 1.0.0"