Re: [PR PATCH] [Updated] vagrant: update to 2.3.0.

[dataCobra <dataCobra@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 628 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages vagrant-update-2.3.0
https://github.com/void-linux/void-packages/pull/38852

vagrant: update to 2.3.0.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64)

I've also updated `do_install` process.

I've added a patch to get rid of an annoying message when executing vagrant commands.



A patch file from https://github.com/void-linux/void-packages/pull/38852.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vagrant-update-2.3.0-38852.patch --]
[-- Type: text/x-diff, Size: 3494 bytes --]

From 16f4290b9f50721a4f869c623a2f1160eae884ea Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Fri, 26 Aug 2022 09:44:51 +0200
Subject: [PATCH] vagrant: update to 2.3.0.

---
 .../silence-warning-about-installer.patch     | 15 ++++++++
 srcpkgs/vagrant/template                      | 38 +++++++++----------
 2 files changed, 33 insertions(+), 20 deletions(-)
 create mode 100644 srcpkgs/vagrant/patches/silence-warning-about-installer.patch

diff --git a/srcpkgs/vagrant/patches/silence-warning-about-installer.patch b/srcpkgs/vagrant/patches/silence-warning-about-installer.patch
new file mode 100644
index 000000000000..4432a13d3737
--- /dev/null
+++ b/srcpkgs/vagrant/patches/silence-warning-about-installer.patch
@@ -0,0 +1,15 @@
+--- /bin/vagrant 2022-08-06 00:16:44.000000000 +0200
++++ /bin/vagrant 2022-08-23 09:50:50.613805575 +0200
+@@ -221,11 +221,6 @@
+       end
+     end
+
+-    if !Vagrant.in_installer? && !Vagrant.very_quiet?
+-      # If we're not in the installer, warn.
+-      env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false)
+-    end
+-
+     # Acceptable experimental flag values include:
+     #
+     # Unset  - Disables experimental features
+
diff --git a/srcpkgs/vagrant/template b/srcpkgs/vagrant/template
index f15d85850d03..6c2d0bf6a11f 100644
--- a/srcpkgs/vagrant/template
+++ b/srcpkgs/vagrant/template
@@ -1,29 +1,34 @@
 # Template file for 'vagrant'
 pkgname=vagrant
-version=2.2.19
-revision=2
+version=2.3.0
+revision=1
 archs="i686 x86_64*"
-hostmakedepends="ruby"
-makedepends="ruby-devel zlib-devel"
+build_style=gemspec
 depends="bsdtar curl openssh rsync"
 short_desc="Tool for building and distributing development environments"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
 license="MIT"
 homepage="https://www.vagrantup.com/"
-distfiles="https://github.com/mitchellh/${pkgname}/archive/v${version}.tar.gz"
-checksum=4f0e6b1d466e26dead682c4d4843e8f64a012eba4be91506ae6c6d34d3d9c8f9
+changelog="https://raw.githubusercontent.com/hashicorp/vagrant/main/CHANGELOG.md"
+distfiles="https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"
+checksum=1931dbf29ec3c6622a649ae145fe706e5b957d7075870ce577358dd22c3d5dca
 nocross=yes
 
 post_extract() {
-	sed -i 's|, "< 3\.1"||g' $pkgname.gemspec
-}
-
-do_build() {
-	gem build $pkgname.gemspec
+	vsed -i 's|, "< 3\.1"||g' vagrant.gemspec
 }
 
 do_install() {
-	GEM_PATH=$DESTDIR/usr/lib/$pkgname GEM_HOME="$GEM_PATH" gem install $pkgname-$version.gem --no-document -- --disable-clean
+	GEM_PATH=$DESTDIR/usr/lib/vagrant GEM_HOME="$GEM_PATH" \
+	gem install vagrant-$version.gem --no-document -- --disable-clean
+
+	vlicense LICENSE
+
+	vbin $FILESDIR/vagrant
+
+	vcompletion "contrib/bash/completion.sh" bash
+
+	vinstall contrib/vim/vagrantfile.vim 644 /usr/share/vim/vim90/ftplugin
 
 	find ${DESTDIR} -type f -name \*.a -delete
 	find ${DESTDIR} -type f -name \*.log -delete
@@ -48,12 +53,5 @@ do_install() {
 	find ${DESTDIR} -type d -name examples -print0|xargs -0 rm -rf --
 	find ${DESTDIR} -type d -name doc -print0|xargs -0 rm -rf --
 	find ${DESTDIR} -type d -name ports -print0|xargs -0 rm -rf --
-	rm -r ${DESTDIR}/usr/lib/$pkgname/cache
-
-	vmkdir usr/bin
-	vmkdir usr/share/bash-completion/completions
-	vbin $FILESDIR/$pkgname
-	ln -sf /usr/lib/$pkgname/gems/$pkgname-$version/contrib/bash/completion.sh \
-		$DESTDIR/usr/share/bash-completion/completions/$pkgname
-	vlicense LICENSE
+	rm -r ${DESTDIR}/usr/lib/vagrant/cache
 }