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

[Jonathan Steel]

    Date: Wednesday, August 10, 2022 @ 17:40:07
  Author: jsteel
Revision: 1265061

upgpkg: vagrant 2.3.0-1

Modified:
  vagrant/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-10 17:30:18 UTC (rev 1265060)
+++ PKGBUILD	2022-08-10 17:40:07 UTC (rev 1265061)
@@ -9,8 +9,8 @@
 # Contributor: Steven Nance <steven at devtrw.com>
 
 pkgname=vagrant
-pkgver=2.2.19
-pkgrel=2
+pkgver=2.3.0
+pkgrel=1
 pkgdesc="Build and distribute virtualized development environments"
 arch=('x86_64')
 url="https://vagrantup.com"
@@ -17,24 +17,18 @@
 license=('MIT')
 options=('!emptydirs')
 depends=('curl' 'libarchive' 'libssh2' 'libxml2' 'libxslt' 'rsync'
-         'ruby2.7' 'xz' 'perl')
+         'ruby' '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=751f6b5")
-md5sums=('0738a0384ccd9cbf4d047638ea493625'
+        "git+https://github.com/mitchellh/vagrant-installers.git#commit=4629e74")
+md5sums=('872b623fd3ba919185b4cc671ea7c20f'
          'SKIP')
 
-prepare() {
-  cd vagrant-installers
-
-  sed -i 's/rubyPath = "ruby"$/rubyPath = "ruby-2.7"/' substrate/launcher/main.go
-}
-
 build() {
   cd $pkgname-$pkgver
-  gem-2.7 build $pkgname.gemspec
+  gem build $pkgname.gemspec
 
   export GO111MODULE=off # golang 1.16 uses modules by default and packages below fail to compile
   cd "$srcdir"/vagrant-installers/substrate/launcher
@@ -60,7 +54,7 @@
 
   GEM_PATH="$EMBEDDED_DIR"/gems/$pkgver GEM_HOME="$GEM_PATH" \
   GEMRC="$EMBEDDED_DIR"/etc/gemrc \
-    gem-2.7 install $pkgname-$pkgver.gem --no-document --prerelease
+    gem install $pkgname-$pkgver.gem --no-document --prerelease
 
   install -Dm755 "$INSTALLERS_DIR"/launcher/vagrant \
     "$pkgdir"/opt/$pkgname/bin/$pkgname