From 14008ee07b3c2236971d230bac138ebd3c3cacc5 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Fri, 26 Aug 2022 08:21:33 +0200 Subject: [PATCH] vagrant: update to 2.3.0. --- .../silence-warning-about-installer.patch | 15 ++++++++ srcpkgs/vagrant/template | 36 +++++++++---------- 2 files changed, 32 insertions(+), 19 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..253f01abea51 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 " 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 -} - 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/$pkgname 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 }